Tweaks to the Layout UI