Merge the latest code from my master branch with your code- I moved this into a partial, so you'll need to move your changes to that partial as well.