Fix #7978 - tidy up layout classes