Added more buttons, all fully functional