Layout fixed again.
Asorted layout fixes. Probably too much for one commit...