Fixed some CSS and layout, needs more work