Thanks for the details Summers Pittman - that makes it a lot clearer.

OK, so if we remove the requirement for entering the app Id, then for metrics and sync we may not need the modal screen. For the others we will still need it.