UI refactoring + comments