Refs #9561; Layout fixes