- Re-order table
- Remove redundant sub-page code