Adding more FP pages and code cleanup for FP pages