Graphical bugs fixing