Finished collision detection, improved button code