Added contains function and updated drawLabel style