Improve layout hierarchy to make page sections less hacky