Fixup attachment layouts
Minor tweaks to UI