Move templates to correct location, fix typos and refactor the same

This test was copied in by `./run_tests.sh -m startpanel`. My bad. Will write proper tests for this