Cleaning up
Upgraded new card button