Cleaned up the base so the statistics page is available and that it will work on small windows
Merge branch 'development' into production