Added menu builder and removed unused parameter