Restructure editor cards layout

And other minor style tweaks