Menu items now have callback capabilities
Removed obsolete functions from main app