Fixed frontend to get along with the backend