Rearrange things a bit to allow for logo