Update to add default fallback controller and admin controller