City Council discusses new fire headquarters, armory budget