Add UI and clean code