Fixed Menu-Navigation, some ideas added