Front end dev fixes