Revert "Revert "final small changes before website is online""

This reverts commit a4c51b46c1b35264d03afe2ce53420e5b23b7498.