Fixed bug (#2781)
Repaired Open File button crash (#2781)
Merge pull request #2806 from aeslaughter/peacock

Fixing outputs related bugs
Merge commit 'b268a2a8c4082d7e30c4ba703a48ce94615d2103'