Got rid of bullets, more button changes