Frontend refactor and completed category selection