Css cleanup and add page design in place