City Tavern is getting a makeover (and some new upstairs neighbors)