Small changes to drawing part