Refactoring
Started to implement UI