Doubts on ghusal

Q: I have a question regarding ghusl. I get constant doubts about the validity of my ghusl. If someone performs ghusl and then sleeps and then does salaah at night but at night time they get a doubt that if the eye and eyebrow was properly washed in ghusl or if it was accidently left dry (note this is more based on doubt rather than certainty). The person then goes to the bathroom and washes his eye and eyebrow with the niyyah of completing the ghusl. Is this valid and he does not need have to repeat his ghusl?  If one hesitates to wash it due to waswasah or because he isn't sure, does he become napak again?

Straightening the Saffs in Salaah

Q: It comes in a Hadith that straighten the rows, the word "taraas" has been mentioned which means join like a brick wall with no gaps. So why do we not join the feet and only the shoulders. Also, what does it mean by close the gaps shaitaan will come in-between? Also, if the companions joint their feet an shoulders should we not follow them in the beggining of Salaah? And is it nessasary to join the shoulders? Please give me daleel as these are people's questions. Where I give dars.