Some front-end changes