Major clean up of the Movies and TV sections

Like the title says, it's a major clean up of the Movies and TV sections. This also restores the movies by genre view.