Few modifications due to the merging of front-end and back-end to the same git repo