Fix highlight of active tube
Refactor drawing of tubes