Extended the skeleton for the factory and added a tabs template