minor bug fixes and ui clean up