added structure and menu