Lots more css/js cleanup