fixes and ui improvements