Updated layout on AddCardPage and Main Page