More work on profiles and routes dialogs
A bit of a cleanup