Graphic Fixes and Changes

Fixes graphics and squashes a few bugs.