Some more graphical changes