Cleaned up consistency between pages, adding in the list of all components to build