Added more menu-items, not finished implementing