Removed deprecated FavoriteSheet, AddFavoriteDialog is used instead
Small fixes to global variables