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
Should all this stuff be in the partial?