Improved setup form