refactored css, reorganized