Remove h/vspaces and replace with padding

Resolves #41