more css/js refactor