Front end refactored