modification on Frontend
Modifications on frontend