UI Color changes, refactorings