When saving buttons by screen, buttons were stored in a HashMap which doesn't maintain order. Closes #3916
Guy Carmeli
a2394dcc17
Keep button order