Fixed front-end bugs