Bugfix + minor graphical change