Tidy up of a few things but still not happy thinking about re-doing as img tags