Template refactoring (ErrorPage and some template elements) - Not done
yet