refactored css classes + js fixes