Reworking UI to remove bars and add context controls to their appropriate pane