Bug fixes (thanks GeeeBeee) & updated Dish screen (thanks stav81244 & MagicHD)