ui improvements
refactor