Some work on setup screen