local fixes
merged from mayers
updated menue link