fixing UI
refactor code, add some animations