Refactor a few more frontend details