- UI-improvements & bugfixes