some tag work and some design tweaks