Added more functionality to almost all buttons