Improve setup experience