Some graphical Enhancements