Clean up + new shell card components (base)