Fixed menus and replaced OverlayWatched

Fixed menus and replaced OverlayWatched