bugfixes with menu, crashes on matrix page