ui changes, code clean up