Added support for margin prefix and suffix

Support for margin prefix and suffix added, used just like the padding
version.  Did some cleanup here and there as well.