Bug fixes and edit expand dialogs