Small front-end fixes