Cleanup and update public pages