Misc Final Touches on graphics