Continued step 1 setup, new queue layout dialogs

#542