Fixed menu display, added sub menu