Refactor push next

Small conceptual refactor and implements the decision to only display one item at a time.