Merge pull request #545 from arthurbenemann/GuidedMode

Changes to Guided Mode