Added clicked element highlighting and fixed double layer 3 data bug.