Optimized the code efficiency

Get the code working with minimal setup. Ready to implement
season/episode views
Fixed highlight options