Make the spacing better