Cleanup old card variables, add ad-rail layout variation