6529 Website improvements task force by @ikertje