bug fixes, started new card layout