Fix session menu, fixes #16