small improvements in UI. code cleanup
small UI changes