Updated UI and removed cardMarginFromIndex