Cleanup after the major refactoring. Now to figure out why the css stopped working properly. Though to be honest, I probably should rip it all out and start from scratch anyway.