add logo and clean up