Cleaned up graphics a bit