CSS and logic changes