Fixed all buttons and added more functionality to buttons