Fixes for crashes and Card UI(WIP)