Prevent user from bailing on pre-test

Added a boolean to MapPanel and a check in the action handler to
prevent them from leaving the pre-test of their own accord.
Also some minor comment wrangling