Fixes for status page
Merge pull request #314 from DrOctogon/testing

Fixes for status page