Added Space selector dropdown and header template