[CLEANUP] Base CSS file tidy.
[CLEANUP] Consolidate base js