Feature/fix map tab