[Red-HD] OnDemand re-work, screen updates and tweaks