Merge pull request #2552 from waldenraines/bastion

Bastion: position panel contents instead of panel to fix scrolling.
Bastion: splitting out systems sub header (toolbar) into it's own view.