add logo, username option, tidy