Consolidated step pages into a single constructor