Update modals.js

make sure that were actually handling a `.modal` element.
update push pages
Fixing up forms a bit.
Resolving minor conflict.