Add IO/edit tab
Clean up controllerview
Merge remote-tracking branch 'origin/controllerview' into development