Playing around with the layout
Bugfix for tag display