1.2 Added more buttons