Fixed front end issues