Better handling of the logo placement.