Improved Application.js