Even more graphical enhancements