Fixing broken profile editor dialog.
Merge branch 'master' into circular

* master:
  Fixing broken profile editor dialog.
Renaming NC- to NB-. Fixing paging. Lots of small tweaks.