Fixed spacing issues in spaces