code cleanup
angle selector ui
refactorings