Fix draw without scrollbar, still need highlight