Tweaks to T&C layout