ENH/STY/BUG: Address PR comments

- Fix a problem in the GUI where if the investigation type was set as
  blank the edit-dropdown would not show a "Non selected" value.
- Re-structure a block of code to be more succint.