change buttons back to images, fix a few bugs