all views except about-team styled, more or less
done merging