Refactored css rules; other minor changes