3rd page and bugfixes