I see what you mean. This looks good to me. @kastiglione what do you think?