Added item collection field check. Cleaned up apps and other views