Use some loops and tags to be more DRY
Remove crufty, old CSS