Bugfix in last commit
More UI improvements