widget.content overflow and height taken out
Added in solution for when the feature is hidden the header bar is still visible.
Merge remote-tracking branch 'upstream/develop' into develop