Fixes #5710 standardizes layouts so that they all have title buttons and the same basic sections
Merge pull request #5851 from cash/layouts

Fixes #5710 standardizes layouts so that they all have title buttons