Bugfix minori in UI