Revert "Updates to aesthetics"

This reverts commit 740dd6aa0b025b605234f5bd202a23fd2fd82cf2.
Revert "Revert "Updates to aesthetics""

This reverts commit 1e20e57c3b578ed4729530b4106fc0943bb098dd.