Bugfix
Minor UI