Restructured the block and template to make things a lot easier. Still work in progress, though.
Tweaks.