Numerous graphical enhancements, bug fixes