Finally fixed schedule viewer