Button function fix

90% sure buttons are working correctly now