Moved base and error templates into base for easy overriding by apps