Working new items plus correct tab handling