Some menu redesign and bug fixing