Finished front-end refactoring