UI changes, code clean up