Some layout changes

This is in addition to the Review commit that was just made