Refactored CSS and transition to Pigeon