Fixed Graphical Issues