Firefox-proofing the menu navigation.
Remove form button workaround that's no longer needed.
FormButton also knows //input
Fix cloud discovery test (form buttons)
   Also clean up imports