Card view improvements! code is a mess