Added more buttons and icons