Fix menu problem and watch problem