Updated the front-end section