Fixed issue with some dialogs not showing the proper name string for an object. Refactored more push buttons.