UI and refactoring
Everything should be 100% working