Modified topbar and application.js