Office redesign and fixes