Improve uvcomment layout a bit