Add more buttons and funtionality