Work on css layout - better - still needs work