Amid spending battle, McHenry remodels office