Changed some markup in the index & show pages, modified the macros to make for a better set of base templates.