UI tweeks and cleaning up code