fixed buttons and dialog
mar requested to pull everything
mar requested to pull everything