including logo and some minor changes on style