Fix menu button problems