ui changes

changes in UI and functionality