final fix to the spacing issues