ES-153: Update [create cluster] wizard layout plus tests