Add fields and filter criterion
Add container around both lower navigation menus