css updates, refactored controllers