refactored controller
merged css