Minor tweaks to layout
Minor tweaks to layout