Cleaned up/updated templates

Now have the basic page base and extensions from there
Updated
Additional Page Templates