refs #6147. Fix z-index and layout.
Merge branch 'feature/6147_format' into develop