More colors to UI. Plus minor refactoring.