another minor refactor, moved main.html.old out of the way