Fix merge conflict cruft

* Remove merge conflict cruft from talent's show
* Change movie's show
* Make movie's show and talent show look nicer
Nah, this seems excessive for a `movie` partial.