Adds all functionality of #29 except for the <br>.

Personally, I feel this looks better. See images below for comparison and feel
free to decide either way.