Update for Gotham changes and new folder dialog