City of Indianapolis announces new plan for City-County Building