Add top menu
Change session to YAML
Add missing schemas.