Updated UI

Added behavior and Add/Remove tabs to UI
fixing merge issue in latest version of Kevin's branch.
Merge branch 'kvnkeith'