ui refactoring, authentication