Refactored, started UI