diff --git a/iphone/Maps/Settings/CountriesViewController.h b/iphone/Maps/Settings/CountriesViewController.h
index 9294bbe56f..5d4f2968bc 100644
--- a/iphone/Maps/Settings/CountriesViewController.h
+++ b/iphone/Maps/Settings/CountriesViewController.h
@@ -11,4 +11,7 @@
 
 - (id) initWithStorage: (storage::Storage &) storage andIndex: (storage::TIndex const &) index andHeader: (NSString *) header;
 
+- (void) OnCountryChange: (storage::TIndex const &) index;
+- (void) OnDownload: (storage::TIndex const &) index withProgress: (TDownloadProgress const &) progress;
+
 @end
diff --git a/iphone/Maps/Settings/CountriesViewController.mm b/iphone/Maps/Settings/CountriesViewController.mm
index 9c679bdab6..3743ae4609 100644
--- a/iphone/Maps/Settings/CountriesViewController.mm
+++ b/iphone/Maps/Settings/CountriesViewController.mm
@@ -13,7 +13,7 @@
 
 using namespace storage;
 
-TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
+static TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
 {
   TIndex index = parentIndex;
   if (index.m_group == -1)
@@ -25,6 +25,16 @@ TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
   return index;
 }
 
+static NSInteger RowFromIndex(TIndex const & index)
+{
+	if (index.m_region != -1)
+  	return index.m_region;
+  else if (index.m_country != -1)
+  	return index.m_country;
+  else
+  	return index.m_group;
+}
+
 @implementation CountriesViewController
 
 - (void) OnCloseButton: (id) sender
@@ -86,7 +96,7 @@ TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
   {
   case EOnDisk:
   	{
-    	uint64_t size = 0;//g_pStorage->CountrySizeInBytes(countryIndex);
+    	TLocalAndRemoteSize::first_type size = m_storage->CountrySizeInBytes(countryIndex).first;
   		// convert size to human readable values
 			char const * kBorMBorGB = "kB";
       if (size > GB)
@@ -131,7 +141,6 @@ TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
   case EInQueue:
   	{
   		cell.textLabel.textColor = [UIColor lightGrayColor];
-//    	cell.detailTextLabel.text = [NSString stringWithFormat: @"Waiting to download %qu %s", size, kBOrMB];
 			cell.detailTextLabel.text = [NSString stringWithFormat: @"Marked for downloading, touch to cancel"];
     	if (!indicator)
       {
@@ -145,10 +154,11 @@ TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
     break;
   case ENotDownloaded:
   	cell.textLabel.textColor = [UIColor blackColor];
-//    cell.detailTextLabel.text = [NSString stringWithFormat: @"Click to download %qu %s", size, kBOrMB];
     cell.detailTextLabel.text = [NSString stringWithFormat: @"Touch to download"];
     cell.accessoryView = nil;
     break;
+  default:
+  	break;
   }
 }
 
@@ -164,8 +174,8 @@ TIndex CalculateIndex(TIndex const & parentIndex, NSIndexPath * indexPath)
   if (m_storage->CountriesCount(index))
   	cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
   else
-  	cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton;
-//  [self UpdateCell: cell forCountry: countryIndex];
+  	cell.accessoryType = UITableViewCellAccessoryNone;
+  [self UpdateCell: cell forCountry: index];
   return cell;
 }
 
@@ -220,104 +230,112 @@ TIndex g_clickedIndex;
   UITableViewCell * cell = [tableView cellForRowAtIndexPath: indexPath];
   // Push the new table view on the stack
 	TIndex index = CalculateIndex(m_index, indexPath);
-	CountriesViewController * newController = [[CountriesViewController alloc] initWithStorage:*m_storage
-  		andIndex: index andHeader: cell.textLabel.text];
-	[self.navigationController pushViewController:newController animated:YES];
-//	NSString * countryName = [[cell textLabel] text];
-//
-//	g_clickedIndex = TIndex(indexPath.section, indexPath.row);
-//	switch (g_pStorage->CountryStatus(g_clickedIndex))
-//  {
-//  	case EOnDisk:
-//    {	// display confirmation popup
-//    	UIActionSheet * popupQuery = [[UIActionSheet alloc]
-//      		initWithTitle: countryName
-//        	delegate: self
-//        	cancelButtonTitle: @"Cancel"
-//        	destructiveButtonTitle: @"Delete"
-//        	otherButtonTitles: nil];
-//    	[popupQuery showFromRect: [cell frame] inView: tableView animated: YES];
-//    	[popupQuery release];
-//    }
-//  	break;
-//  	case ENotDownloaded:
-//  	case EDownloadFailed:
-//  	{	// display confirmation popup with country size
-//    	BOOL isWifiConnected = [CountriesViewController IsUsingWIFI];
-//      
-//    	uint64_t size = 0;//g_pStorage->CountrySizeInBytes(g_clickedIndex);
-//  		// convert size to human readable values
-//      NSString * strTitle = nil;
-//      NSString * strDownload = nil;
-//  		if (size > GB)
-//  		{
-//    		size /= GB;
-//				if (isWifiConnected)
-//        	strTitle = [NSString stringWithFormat:@"%@", countryName];
-//        else
-//        	strTitle = [NSString stringWithFormat:@"We strongly recommend using WIFI for downloading %@", countryName];
-//        strDownload = [NSString stringWithFormat:@"Download %qu GB", size];
-//    	}
-//  		else if (size > MB)
-//  		{
-//    		size /= MB;
-//				if (isWifiConnected || size < MAX_3G_MEGABYTES)
-//        	strTitle = [NSString stringWithFormat:@"%@", countryName];
-//        else
-//        	strTitle = [NSString stringWithFormat:@"We strongly recommend using WIFI for downloading %@", countryName];
-//        strDownload = [NSString stringWithFormat:@"Download %qu MB", size];
-//  		}
-//  		else
-//  		{
-//    		size = (size + 999) / 1000;
-//        strTitle = [NSString stringWithFormat:@"%@", countryName];
-//        strDownload = [NSString stringWithFormat:@"Download %qu kB", size];
-//  		}
-//
-//    	UIActionSheet * popupQuery = [[UIActionSheet alloc]
-//      		initWithTitle: strTitle
-//        	delegate: self
-//        	cancelButtonTitle: @"Cancel"
-//        	destructiveButtonTitle: strDownload
-//        	otherButtonTitles: nil];
-//    	[popupQuery showFromRect: [cell frame] inView: tableView animated: YES];
-//    	[popupQuery release];    	
-////  	g_pStorage->DownloadCountry(g_clickedIndex);
-//		}
-//  	break;
-//  	case EDownloading:
-//    { // display confirmation popup
-//    	UIActionSheet * popupQuery = [[UIActionSheet alloc]
-//      		initWithTitle: countryName
-//        	delegate: self
-//        	cancelButtonTitle: @"Do Nothing"
-//        	destructiveButtonTitle: @"Cancel Download"
-//        	otherButtonTitles: nil];
-//    	[popupQuery showFromRect: [cell frame] inView: tableView animated: YES];
-//    	[popupQuery release];
-//    }
-//    break;
-//  	case EInQueue:
-//  	// cancel download
-//    g_pStorage->DeleteCountry(g_clickedIndex);
-//		break;
-//  }
+  if (m_storage->CountriesCount(index))
+  {
+		CountriesViewController * newController = [[CountriesViewController alloc] initWithStorage:*m_storage
+  			andIndex: index andHeader: cell.textLabel.text];
+		[self.navigationController pushViewController:newController animated:YES];
+  }
+  else
+  {
+		NSString * countryName = [[cell textLabel] text];
+
+		g_clickedIndex = index;
+		switch (m_storage->CountryStatus(g_clickedIndex))
+  	{
+  		case EOnDisk:
+    	{	// display confirmation popup
+    		UIActionSheet * popupQuery = [[UIActionSheet alloc]
+      			initWithTitle: countryName
+        		delegate: self
+        		cancelButtonTitle: @"Cancel"
+        		destructiveButtonTitle: @"Delete"
+        		otherButtonTitles: nil];
+    		[popupQuery showFromRect: [cell frame] inView: tableView animated: YES];
+    		[popupQuery release];
+    	}
+  		break;
+  		case ENotDownloaded:
+  		case EDownloadFailed:
+  		{	// display confirmation popup with country size
+    		BOOL isWifiConnected = [CountriesViewController IsUsingWIFI];
+      
+    		TLocalAndRemoteSize sizePair = m_storage->CountrySizeInBytes(g_clickedIndex);
+        TLocalAndRemoteSize::first_type size = sizePair.second - sizePair.first;
+  			// convert size to human readable values
+      	NSString * strTitle = nil;
+      	NSString * strDownload = nil;
+  			if (size > GB)
+  			{
+    			size /= GB;
+					if (isWifiConnected)
+        		strTitle = [NSString stringWithFormat:@"%@", countryName];
+        	else
+        		strTitle = [NSString stringWithFormat:@"We strongly recommend using WIFI for downloading %@", countryName];
+        	strDownload = [NSString stringWithFormat:@"Download %qu GB", size];
+    		}
+  			else if (size > MB)
+  			{
+    			size /= MB;
+					if (isWifiConnected || size < MAX_3G_MEGABYTES)
+        		strTitle = [NSString stringWithFormat:@"%@", countryName];
+        	else
+        		strTitle = [NSString stringWithFormat:@"We strongly recommend using WIFI for downloading %@", countryName];
+        	strDownload = [NSString stringWithFormat:@"Download %qu MB", size];
+  			}
+  			else
+  			{
+    			size = (size + 999) / 1000;
+        	strTitle = [NSString stringWithFormat:@"%@", countryName];
+        	strDownload = [NSString stringWithFormat:@"Download %qu kB", size];
+  			}
+
+    		UIActionSheet * popupQuery = [[UIActionSheet alloc]
+      			initWithTitle: strTitle
+        		delegate: self
+        		cancelButtonTitle: @"Cancel"
+        		destructiveButtonTitle: strDownload
+        		otherButtonTitles: nil];
+    		[popupQuery showFromRect: [cell frame] inView: tableView animated: YES];
+    		[popupQuery release];    	
+			}
+  		break;
+  		case EDownloading:
+    	{ // display confirmation popup
+    		UIActionSheet * popupQuery = [[UIActionSheet alloc]
+      			initWithTitle: countryName
+        		delegate: self
+        		cancelButtonTitle: @"Do Nothing"
+        		destructiveButtonTitle: @"Cancel Download"
+        		otherButtonTitles: nil];
+    		[popupQuery showFromRect: [cell frame] inView: tableView animated: YES];
+    		[popupQuery release];
+    	}
+    	break;
+  		case EInQueue:
+  		// cancel download
+    	m_storage->DeleteCountry(g_clickedIndex);
+			break;
+      default:
+      break;
+  	}
+  }
 }
 
-- (void) OnDownloadFinished: (TIndex const &) index
+- (void) OnCountryChange: (TIndex const &) index
 {
-  UITableView * tableView = (UITableView *)[self.view.subviews objectAtIndex: 1];
-//  UITableViewCell * cell = [tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: index.second inSection: index.first]];
-//  if (cell)
-//		[self UpdateCell: cell forCountry: index];
+  UITableView * tableView = (UITableView *)self.view;
+  UITableViewCell * cell = [tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: RowFromIndex(index) inSection: 0]];
+  if (cell)
+		[self UpdateCell: cell forCountry: index];
 }
 
 - (void) OnDownload: (TIndex const &) index withProgress: (TDownloadProgress const &) progress
 {
-  UITableView * tableView = (UITableView *)[self.view.subviews objectAtIndex: 1];
-//  UITableViewCell * cell = [tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: index.second inSection: index.first]];
-//  if (cell)
-//		cell.detailTextLabel.text = [NSString stringWithFormat: @"Downloading %qu%%, touch to cancel", progress.first * 100 / progress.second];
+  UITableView * tableView = (UITableView *)self.view;
+  UITableViewCell * cell = [tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: RowFromIndex(index) inSection: 0]];
+  if (cell)
+		cell.detailTextLabel.text = [NSString stringWithFormat: @"Downloading %qu%%, touch to cancel", progress.first * 100 / progress.second];
 }
 
 @end
diff --git a/iphone/Maps/Settings/SettingsManager.mm b/iphone/Maps/Settings/SettingsManager.mm
index e3f00f0fca..d76898e95e 100644
--- a/iphone/Maps/Settings/SettingsManager.mm
+++ b/iphone/Maps/Settings/SettingsManager.mm
@@ -3,23 +3,10 @@
 
 #include "../../../storage/storage.hpp"
 
+#include <boost/bind.hpp>
+
 using namespace storage;
 
-static void OnCountryChange(TIndex const & index)
-{
-
-}
-
-static void OnCountryDownloadProgress(TIndex const & index, TDownloadProgress const & progress)
-{
-
-}
-
-static void OnUpdateCheck(int64_t size, char const * readme)
-{
-
-}
-
 // Settings are always present globally
 @implementation SettingsManager
 
@@ -40,6 +27,25 @@ static void OnUpdateCheck(int64_t size, char const * readme)
 	[SettingsManager Hide];
 }
 
+
++ (void) OnCountryChange: (TIndex const &) index
+{
+	if (g_navController)
+  	[(CountriesViewController *)g_navController.topViewController OnCountryChange: index];
+}
+
++ (void) OnCountryDownload: (TIndex const &) index withProgress: (TDownloadProgress const &) progress
+{
+	if (g_navController)
+  	[(CountriesViewController *)g_navController.topViewController OnDownload: index withProgress: progress];
+}
+
++ (void) OnUpdateCheck: (int64_t) size withReadme: (char const *) readme
+{
+
+}
+
+
 // Currently displays only countries to download
 + (void) Show: (UIViewController *)parentController WithStorage: (Storage &)storage
 {
@@ -50,7 +56,21 @@ static void OnUpdateCheck(int64_t size, char const * readme)
     		andIndex:TIndex() andHeader:@"Download"];
   	g_navController = [[UINavigationController alloc] initWithRootViewController:rootViewController];
     
-  	storage.Subscribe(&OnCountryChange, &OnCountryDownloadProgress, &OnUpdateCheck);
+    // tricky boost::bind for objC class methods
+		typedef void (*TChangeFunc)(SEL, TIndex const &);
+		SEL changeSel = @selector(OnCountryChange:);
+		TChangeFunc changeImpl = (TChangeFunc)[self methodForSelector:changeSel];
+
+		typedef void (*TProgressFunc)(SEL, TIndex const &, TDownloadProgress const &);
+		SEL progressSel = @selector(OnCountryDownload:withProgress:);
+		TProgressFunc progressImpl = (TProgressFunc)[self methodForSelector:progressSel];
+
+		typedef void (*TUpdateFunc)(SEL, int64_t, char const *);
+		SEL updateSel = @selector(OnUpdateCheck:);
+		TUpdateFunc updateImpl = (TUpdateFunc)[self methodForSelector:updateSel];
+
+		storage.Subscribe(boost::bind(changeImpl, changeSel, _1),
+    		boost::bind(progressImpl, progressSel, _1, _2), boost::bind(updateImpl, updateSel, _1, _2));
   }
 
   [parentController presentModalViewController:g_navController animated:YES];
@@ -63,7 +83,8 @@ static void OnUpdateCheck(int64_t size, char const * readme)
   {
     g_storage->Unsubscribe();
 		[[g_navController parentViewController] dismissModalViewControllerAnimated:YES];
-  	g_navController = nil;
+  	[g_navController release];
+    g_navController = nil;
   }
 }