[Front-end] Fixed up a bunch of lost commits due to accidentally messing up the git revert earlier.