reformatted buttons
merge 2AM