Refactor to move welcome page into a dialog