bug fixes and ui changes