Initial Graphical improvements