Revamped the frontend