Moved restoreState to child menu