minor refactor
UI changes