Reimported changes.  Adding tabs for each possible page