all done and ugly :)

Good use of helpers here for the links.