Graphics improvements + bugfix