Code cleanup
UI changes