Add small fixes to ui
Merge pull