A lot of graphical improvements