Refactoring demo UI.
Refactoring repositories.