Minor tweaks to layout view