Fixed underfull hbox by replacing ugly stuff with a custom command that uses nice LaTeX stuff.