Updated UI

Added behavior and Add/Remove tabs to UI