Adding in pin highlighting and pin list