Fix Frontend code