Added item menu, eliminated possibility of NPE