Fix habitat future prospects & structure mixup
Merge branch 'master' into production