Re-organized page organization to be more user friendly.