factored out bolus drawing to common function and adjusted tooltip position