Bugfixes; small UI improvements