more work on setup screens