Do away with require js, modularize javascript
Also, minor fix minor modal issues