More work on setup form
More work on setup/installation process