Some  layout improvements.