Restoring Layout on a toolbar which had buttons removed does not work correctly.

If you remove some (say "n") buttons, SaveLayout then RestoreLayout buttons are just added sequentially until total - n buttons have been displayed, ie the last n buttons are not added, which may not be those that were removed