Some UI-modifications