Finish tidying code, Fixing layout in progress