More fixes and changes to the editor

Fixed issues with alternating items.