Changes to protect the layout from logo size issues