SOme front.js fixes