Fixes for renamed getter methods + small refactor of ribbon dialogs.