brutal changes to the layout and a little css, need to refine further