menu refactor almost done!
final menu refactor