Added Active Link Code, but needs further debugging/testing