Fixing number of minor issues
Merge pull request #1222 from alterm4nn/minorfixes

Fixing number of minor issues
Bugfix #1216. Testability for homepage in dev environment.
Bugfix #1125.