bugfixes, UI adjustments