Made changes in Frontend