Added sorting by card type, small bug fixes

Still needs a UI element to switch between sort types