Fixed some buttons not working after last commit