Minor markup and interface tweaks fo "Edit Label Layout"