Added multiple tap handlers (tooltips are coming), deleted redundant code, fixed black line
Fixed Conflicts