fixed menu, multiple names, added calendar viewer