Menu class got improved.