Revert back to presentation for variant, fix specs