Rename user buttons as the other mode buttons
Add more assertions about modes