Refactor layout inheritance.
Merge pull request #557 from moneyadviceservice/refactor-layouts

Refactor layout inheritance