Some changes to improve the logo functionality.