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