Fixes

Fixes to smaller ui objects