Tidy up layout of editor label and button