Now generating corect links
Fixed menu