Revamp front-end