Most css and structure changes complete