Fixing the spacing issues