Added badge property to Item
Minor changes to View