Issue 3407 mobile buttons

Clean up buttons on mobile.