this sucks -- I guess, I should revert the last change. Phone screens are still so small that two buttons would look cluttered