Some front-end fixes