Fix graphical bugs