Fix menu links
Fix handling saved views
Fix handling saved views