New styling for everything, tweaking column output and card output
Fix merge conflicts