Added cloner support and menu fixes