Fixed redraw issue, redraw now takes less than 100ms