added fixes for TV Mode