fixes to layout, its getting closer to being fixed simplified and converted to haml.