Added more buttons and change colors