Refactored front-end