Swapped all tabs for spaces and added return groups