Minor touchups to UI