Generic menu creation added & minor refactoring