Integrating nina's stuff
Merged stuff, fixed stuff!

Yay! Now for the events page and then things can go up!
Will fix more later

mergh