Small graphical update and bug fix