Close #369. Close #336. Use template on location, restruct step 4, add overview
Merge pull request #370 from simonv3/edit-guides

Close #369. Close #336. Use template on location, restruct step 4, add overview