Updated templates and update admin pages