Changed layout - removed some code in prep for separation of code