Moved all "vspace" commands from around to inside the "figure" and
"table" environments, to move them together when needed. Before, the
environment would be moved, but the space would remain, causing
whitespace to appear between the paragraphs.