Added Menu handling