Changed background to be more conservative
Refactored controllers