fixed submit dialogue box to return to main screen
fixed merge conflict