Improved preview (start & end on char)