fixes and ui changes