added menu items, and other basic stuff