Update #2345 by Henry: Clean up the css and js