Tidied up UI in Save as Vehicle and Save as Environment

Fixes #32 and fixes #33