[CLEANUP] combine/remove js and css, tidy up HTML