Address the spacing issues, still need to implement Glyph's suggestions.