Renamed
Cleanup old stuff
Moved loading of CSS
Cleanup