Final changes to layout and css cleanup