New simpler (sort of) logic for display of the preliminary screen

Fixes #495