cleanup layouts a bit