clean up naming in caption string generation, remove unneeded <p> tag
small CSS tweak to caption string placement