SWITCHYARD-954 - Adding new button bar and context menu functionality