Merge Scott's & James' changes in dispose view