fix button colors and ordering to be consistent