Starting to clean up
Modifies layout more
some cleaning