Migrating to new CSS and JS stuff
Merging stuff