Remove logo from background

To maintain the aspect ratio of the logo. Tidy other code.