Refactored methods + new card layout on main panel