Refactoring
UI improvements
Further UI implementation