Updating new 'gary' branch. SBiDer UI fixes.
Merging issues with self.