Revert "dialogs work but pull up main activity screen"

This reverts commit f34dcb4c5056dfabc4554136b0ad27d907c5704c.