Revamp fixit view, DRY.