Cards view enhanced according to wireframes proposed. Small changes to Table view as well