Improve context drawing