small fixes and ui