20201002 city.pune: Layout tweaks to match norms