Few changes to better manage the frontend code