Touch up headers and layout and organize css