Combined 2 header files and updated all pages.