added fb page tables and some refactoring