a few logo and css changes
merge fixed?