Fix merge cruft

* Remove merge conflict cruft from talent's show
* Change movie's show
* Make movie's show and talent show look nicer
Also, not sure about this entire file.