The 'Done' button will now be displayed as soon as the diff panel is opened(unless its opened for a merge).  Also fixed a small bug caused by features not be re-loaded when selected.