Added floor-plan selection stuff