merged 2c1afb6ee1e4ddb5cad77d4593e35a04c9bbc9b5 to fix main page layout