Fixed menu issues - but broke in page links again