Changed up some card structure