Added context menu for items and moved search