Made changes to buttons and some minor fixes