Tartu city government approved plans for a new urban district in Annelinn that will include a six-story headquarters for the Estonian police and border guard, designed to replace overcrowded facilities at the current Riia tänav location.