moved more stuff
Moved footer again, added scroll bars to content area