added consistency to the includes
remove fallback from menu
cleaned up the call