Card 36 and UI Changes