Cleaned up the graphics a little