WIP: Use nested layouts to dry out markup

# DO NOT MERGE

Initial work on creating reusable layout inheritance