Bugfixes + Layout fixes + stats re-enabled