Remove old.css
Consolidate javascript