Final Layout

Final layout - I'm fixing the icons at the top atm.