Fix the stores and redo the dialogs again
Merge branch 'fix_shops' into 44/manage_tasks