Various front-end fixes