cleanup ui functionality
refactor some logic, add simple animations