Nikolic's office upgrade set for June completion