Changed the way CustomButtonDialog handled duplication. Using a set re-ordered the buttons. This way, the order of the buttons in the list is now kept.