Layout tuneup

This could be clearer and not so generic. How about some change @githubstudent?