Refresh for 2.3

Edit Manual Tivo is now Edit Tivo with Bonjour shown. 
Misc little fixes