small fixes and ui improvements