Removed Show Disabled items toggle and fixed groups. Also tweaked some logic