typos, refactoring and improving UI