Move attack/defence and minor types to a bar

Also, get rid of that useless $container, and display more cards per row
(by reducing the margin)