Updated setup page to allow set choice

Also bug fixes and improvements