Frontend refactoring done