Add tags to layouts

* And matching styles