[ios] Refactoring.

62 files changed, 372 insertions, 289 deletions

diff --git a/iphone/Common/RichTextVC.h b/iphone/Common/RichTextVC.h
index 4ee5048dae..de2e7745d1 100644
--- a/iphone/Common/RichTextVC.h
+++ b/iphone/Common/RichTextVC.h
@@ -1,8 +1,6 @@
+#import "MWMViewController.h"
 
-#import <UIKit/UIKit.h>
-#import "ViewController.h"
-
-@interface RichTextVC : ViewController
+@interface RichTextVC : MWMViewController
 
 - (instancetype)initWithText:(NSString *)text;
 
diff --git a/iphone/Common/WebViewController.h b/iphone/Common/WebViewController.h
index f24f76f0fd..be58eafdb3 100644
--- a/iphone/Common/WebViewController.h
+++ b/iphone/Common/WebViewController.h
@@ -1,7 +1,6 @@
-#import <UIKit/UIKit.h>
-#import "ViewController.h"
+#import "MWMViewController.h"
 
-@interface WebViewController : ViewController <UIWebViewDelegate>
+@interface WebViewController : MWMViewController <UIWebViewDelegate>
 
 @property (nonatomic) NSURL * m_url;
 @property (nonatomic) NSString * m_htmlText;
diff --git a/iphone/Maps/Bookmarks/AddSetVC.h b/iphone/Maps/Bookmarks/AddSetVC.h
index d28cd2ebcb..0cba9b7038 100644
--- a/iphone/Maps/Bookmarks/AddSetVC.h
+++ b/iphone/Maps/Bookmarks/AddSetVC.h
@@ -1,5 +1,4 @@
-#import <UIKit/UIKit.h>
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
 @class AddSetVC;
 @protocol AddSetVCDelegate <NSObject>
@@ -8,7 +7,7 @@
 
 @end
 
-@interface AddSetVC : TableViewController
+@interface AddSetVC : MWMTableViewController
 
 @property (weak, nonatomic) id<AddSetVCDelegate> delegate;
 
diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.h b/iphone/Maps/Bookmarks/BookmarksRootVC.h
index 5e78707923..c1daab8549 100644
--- a/iphone/Maps/Bookmarks/BookmarksRootVC.h
+++ b/iphone/Maps/Bookmarks/BookmarksRootVC.h
@@ -1,7 +1,6 @@
-#import <UIKit/UIKit.h>
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface BookmarksRootVC : TableViewController <UITextFieldDelegate>
+@interface BookmarksRootVC : MWMTableViewController <UITextFieldDelegate>
 {
   /// Description for the user: how to create/import bookmarks.
   /// We store it here to correctly calculate dynamic table footer height depending on the text formatting.
diff --git a/iphone/Maps/Bookmarks/BookmarksVC.h b/iphone/Maps/Bookmarks/BookmarksVC.h
index 5fba73bb9d..7082345c31 100644
--- a/iphone/Maps/Bookmarks/BookmarksVC.h
+++ b/iphone/Maps/Bookmarks/BookmarksVC.h
@@ -1,8 +1,7 @@
-#import <UIKit/UIKit.h>
-#import "TableViewController.h"
 #import "LocationManager.h"
+#import "MWMTableViewController.h"
 
-@interface BookmarksVC : TableViewController <LocationObserver, UITextFieldDelegate>
+@interface BookmarksVC : MWMTableViewController <LocationObserver, UITextFieldDelegate>
 {
   LocationManager * m_locationManager;
   size_t m_categoryIndex;
diff --git a/iphone/Maps/Bookmarks/SelectSetVC.h b/iphone/Maps/Bookmarks/SelectSetVC.h
index 64946ec8d2..f3b0ee9954 100644
--- a/iphone/Maps/Bookmarks/SelectSetVC.h
+++ b/iphone/Maps/Bookmarks/SelectSetVC.h
@@ -1,10 +1,8 @@
-
-#import <UIKit/UIKit.h>
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
 @class MWMPlacePageViewManager;
 
-@interface SelectSetVC : TableViewController
+@interface SelectSetVC : MWMTableViewController
 
 - (instancetype)initWithPlacePageManager:(MWMPlacePageViewManager *)manager;
 
diff --git a/iphone/Maps/Classes/Components/MWMController.h b/iphone/Maps/Classes/Components/MWMController.h
new file mode 100644
index 0000000000..aed06f2547
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMController.h
@@ -0,0 +1,11 @@
+@class MWMAlertViewController;
+
+@protocol MWMController <NSObject>
+
+@property (nonatomic, readonly) BOOL hasNavigationBar;
+
+@property (nonatomic, readonly) MWMAlertViewController * alertController;
+
+- (void)mwm_refreshUI;
+
+@end
diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.h b/iphone/Maps/Classes/Components/MWMNavigationController.h
new file mode 100644
index 0000000000..ebd0a9ccf0
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMNavigationController.h
@@ -0,0 +1,4 @@
+
+@interface MWMNavigationController : UINavigationController
+
+@end
diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.mm b/iphone/Maps/Classes/Components/MWMNavigationController.mm
new file mode 100644
index 0000000000..9ff2461e8f
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMNavigationController.mm
@@ -0,0 +1,38 @@
+#import "MapsAppDelegate.h"
+#import "MWMController.h"
+#import "MWMNavigationController.h"
+#import "UIViewController+Navigation.h"
+
+@interface MWMNavigationController () <UINavigationControllerDelegate>
+
+@end
+
+@implementation MWMNavigationController
+
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+  return UIStatusBarStyleLightContent;
+}
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  self.delegate = self;
+}
+
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated
+{
+  NSAssert([viewController conformsToProtocol:@protocol(MWMController)], @"Controller must inherit ViewController or TableViewController class");
+  id<MWMController> vc = static_cast<id<MWMController>>(viewController);
+  [navigationController setNavigationBarHidden:!vc.hasNavigationBar animated:animated];
+
+  if ([navigationController.viewControllers count] > 1)
+    [viewController showBackButton];
+}
+
+- (BOOL)shouldAutorotate
+{
+  return YES;
+}
+
+@end
diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.h b/iphone/Maps/Classes/Components/MWMTableViewController.h
new file mode 100644
index 0000000000..286563e2a9
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMTableViewController.h
@@ -0,0 +1,5 @@
+#import "MWMController.h"
+
+@interface MWMTableViewController : UITableViewController <MWMController>
+
+@end
diff --git a/iphone/Maps/TableViewController.mm b/iphone/Maps/Classes/Components/MWMTableViewController.mm
index a801b8173e..162ac0e75c 100644
--- a/iphone/Maps/TableViewController.mm
+++ b/iphone/Maps/Classes/Components/MWMTableViewController.mm
@@ -1,12 +1,19 @@
 #import "MapsAppDelegate.h"
 #import "MapViewController.h"
+#import "MWMAlertViewController.h"
 #import "MWMTableViewCell.h"
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 #import "UIColor+MapsMeColor.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
-@implementation TableViewController
+@interface MWMTableViewController ()
+
+@property (nonatomic, readwrite) MWMAlertViewController * alertController;
+
+@end
+
+@implementation MWMTableViewController
 
 - (BOOL)prefersStatusBarHidden
 {
@@ -46,4 +53,18 @@
   [super viewWillDisappear:animated];
 }
 
+#pragma mark - Properties
+
+- (BOOL)hasNavigationBar
+{
+  return YES;
+}
+
+- (MWMAlertViewController *)alertController
+{
+  if (!_alertController)
+    _alertController = [[MWMAlertViewController alloc] initWithViewController:self];
+  return _alertController;
+}
+
 @end
diff --git a/iphone/Maps/Classes/Components/MWMViewController.h b/iphone/Maps/Classes/Components/MWMViewController.h
new file mode 100644
index 0000000000..493bf3e6a4
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMViewController.h
@@ -0,0 +1,5 @@
+#import "MWMController.h"
+
+@interface MWMViewController : UIViewController <MWMController>
+
+@end
diff --git a/iphone/Maps/Classes/Components/MWMViewController.mm b/iphone/Maps/Classes/Components/MWMViewController.mm
new file mode 100644
index 0000000000..4d97acc4f0
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMViewController.mm
@@ -0,0 +1,62 @@
+#import "Common.h"
+#import "MapsAppDelegate.h"
+#import "MapViewController.h"
+#import "MWMAlertViewController.h"
+#import "MWMViewController.h"
+
+#import "3party/Alohalytics/src/alohalytics_objc.h"
+
+@interface MWMViewController ()
+
+@property (nonatomic, readwrite) MWMAlertViewController * alertController;
+
+@end
+
+@implementation MWMViewController
+
+- (BOOL)prefersStatusBarHidden
+{
+  return NO;
+}
+
+- (void)mwm_refreshUI
+{
+  [self.navigationController.navigationBar mwm_refreshUI];
+  [self.view mwm_refreshUI];
+  if (![self isKindOfClass:[MapViewController class]])
+    [[MapsAppDelegate theApp].mapViewController mwm_refreshUI];
+}
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  [self.navigationController.navigationBar setTranslucent:NO];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+  [Alohalytics logEvent:@"$viewWillAppear" withValue:NSStringFromClass([self class])];
+  [super viewWillAppear:animated];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+  [Alohalytics logEvent:@"$viewWillDisappear" withValue:NSStringFromClass([self class])];
+  [super viewWillDisappear:animated];
+}
+
+#pragma mark - Properties
+
+- (BOOL)hasNavigationBar
+{
+  return YES;
+}
+
+- (MWMAlertViewController *)alertController
+{
+  if (!_alertController)
+    _alertController = [[MWMAlertViewController alloc] initWithViewController:self];
+  return _alertController;
+}
+
+@end
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
index 667955edd9..51c7775286 100644
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
@@ -1,10 +1,10 @@
 #import "MWMAlert.h"
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 #include "routing/router.hpp"
 #include "storage/storage.hpp"
 
-@interface MWMAlertViewController : ViewController
+@interface MWMAlertViewController : MWMViewController
 
 @property (weak, nonatomic, readonly) UIViewController * ownerViewController;
 
@@ -23,8 +23,10 @@
 - (void)presentLocationAlert;
 - (void)presentLocationServiceNotSupportedAlert;
 - (void)presentNoConnectionAlert;
-- (void)presentnoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block;
+- (void)presentNoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block;
 - (void)presentPedestrianToastAlert:(BOOL)isFirstLaunch;
+- (void)presentInternalErrorAlert;
+- (void)presentInvalidUserNameOrPasswordAlert;
 - (void)closeAlertWithCompletion:(nullable TMWMVoidBlock)completion;
 
 - (nonnull instancetype)init __attribute__((unavailable("call -initWithViewController: instead!")));
diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
index 4b49479010..a6322c9711 100644
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
@@ -86,7 +86,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
   [self displayAlert:MWMAlert.noConnectionAlert];
 }
 
-- (void)presentnoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block
+- (void)presentNoWiFiAlertWithName:(nonnull NSString *)name downloadBlock:(nullable TMWMVoidBlock)block
 {
   [self displayAlert:[MWMAlert noWiFiAlertWithName:name downloadBlock:block]];
 }
@@ -96,6 +96,16 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
   [self displayAlert:[MWMAlert pedestrianToastShareAlert:isFirstLaunch]];
 }
 
+- (void)presentInternalErrorAlert
+{
+  [self displayAlert:[MWMAlert internalErrorAlert]];
+}
+
+- (void)presentInvalidUserNameOrPasswordAlert
+{
+  [self displayAlert:[MWMAlert invalidUserNameOrPasswordAlert]];
+}
+
 - (void)presentDownloaderAlertWithCountries:(vector<storage::TIndex> const &)countries
                                      routes:(vector<storage::TIndex> const &)routes
                                        code:(routing::IRouter::ResultCode)code
diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
index 933a832a8e..92dc4eba17 100644
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
@@ -20,6 +20,8 @@
 + (MWMAlert *)noConnectionAlert;
 + (MWMAlert *)locationServiceNotSupportedAlert;
 + (MWMAlert *)pedestrianToastShareAlert:(BOOL)isFirstLaunch;
++ (MWMAlert *)internalErrorAlert;
++ (MWMAlert *)invalidUserNameOrPasswordAlert;
 + (MWMAlert *)point2PointAlertWithOkBlock:(TMWMVoidBlock)block needToRebuild:(BOOL)needToRebuild;
 + (MWMAlert *)needMigrationAlertWithOkBlock:(TMWMVoidBlock)block;
 - (void)close;
diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
index 296a726402..dec8504384 100644
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
@@ -88,7 +88,7 @@
     case routing::IRouter::FileTooOld:
       return [MWMDefaultAlert routeFileNotExistAlert];
     case routing::IRouter::InternalError:
-      return [MWMDefaultAlert internalErrorAlert];
+      return [MWMDefaultAlert internalRoutingErrorAlert];
     case routing::IRouter::Cancelled:
     case routing::IRouter::NoError:
     case routing::IRouter::NeedMoreMaps:
@@ -101,6 +101,16 @@
   return [MWMPedestrianShareAlert alert:isFirstLaunch];
 }
 
++ (MWMAlert *)internalErrorAlert
+{
+  return [MWMDefaultAlert internalErrorAlert];
+}
+
++ (MWMAlert *)invalidUserNameOrPasswordAlert
+{
+  return [MWMDefaultAlert invalidUserNameOrPasswordAlert];
+}
+
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation
 {
 // Should override this method if you want custom relayout after rotation.
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
index f2d380d43a..929c5422b3 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
@@ -6,7 +6,9 @@
 + (instancetype)routeFileNotExistAlert;
 + (instancetype)endPointNotFoundAlert;
 + (instancetype)startPointNotFoundAlert;
++ (instancetype)internalRoutingErrorAlert;
 + (instancetype)internalErrorAlert;
++ (instancetype)invalidUserNameOrPasswordAlert;
 + (instancetype)noCurrentPositionAlert;
 + (instancetype)pointsInDifferentMWMAlert;
 + (instancetype)disabledLocationAlert;
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
index 7d01e8c3cc..33acdee084 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
@@ -79,13 +79,25 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
   return [self defaultAlertWithTitle:@"dialog_routing_change_start" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
 }
 
-+ (instancetype)internalErrorAlert
++ (instancetype)internalRoutingErrorAlert
 {
-  kStatisticsEvent = @"Internal Error Alert";
+  kStatisticsEvent = @"Internal Routing Error Alert";
   NSString * message = [NSString stringWithFormat:@"%@\n\n%@", L(@"dialog_routing_application_error"), L(@"dialog_routing_try_again")];
   return [self defaultAlertWithTitle:@"dialog_routing_system_error" message:message rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
 }
 
++ (instancetype)internalErrorAlert
+{
+  kStatisticsEvent = @"Internal Error Alert";
+  return [self defaultAlertWithTitle:@"dialog_routing_system_error" message:nil rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+}
+
++ (instancetype)invalidUserNameOrPasswordAlert
+{
+  kStatisticsEvent = @"Invalid User Name or Password Alert";
+  return [self defaultAlertWithTitle:@"invalid_username_or_password" message:nil rightButtonTitle:@"ok" leftButtonTitle:nil rightButtonAction:nil];
+}
+
 + (instancetype)noCurrentPositionAlert
 {
   kStatisticsEvent = @"No Current Position Alert";
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h
index 16885bc3d7..3558360456 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationForgottenPasswordViewController.h
@@ -1,5 +1,5 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
-@interface MWMAuthorizationForgottenPasswordViewController : ViewController
+@interface MWMAuthorizationForgottenPasswordViewController : MWMViewController
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h
index aec78e0ea2..53a9243eb2 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h
@@ -1,6 +1,6 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
-@interface MWMAuthorizationLoginViewController : ViewController
+@interface MWMAuthorizationLoginViewController : MWMViewController
 
 @property (nonatomic) BOOL isCalledFromSettings;
 
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
index 7958a45e6f..28d5e1f90a 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
@@ -207,7 +207,7 @@ using namespace osm_auth_ios;
   if (Platform::IsConnected())
     block();
   else
-    [self showAlert:L(@"no_internet_connection_detected") withButtonTitle:L(@"ok")];
+    [self.alertController presentNoConnectionAlert];
 }
 
 - (IBAction)loginGoogle
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h
index e837d717ae..8cf14391be 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h
@@ -1,5 +1,5 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
-@interface MWMAuthorizationOSMLoginViewController : ViewController
+@interface MWMAuthorizationOSMLoginViewController : MWMViewController
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
index 8b239cc71a..8e264859f1 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
@@ -1,3 +1,4 @@
+#import "MWMAlertViewController.h"
 #import "MWMAuthorizationCommon.h"
 #import "MWMAuthorizationOSMLoginViewController.h"
 #import "MWMCircularProgress.h"
@@ -149,14 +150,14 @@ using namespace osm;
         }
         else
         {
-          [self showAlert:L(@"invalid_username_or_password") withButtonTitle:L(@"ok")];
+          [self.alertController presentInvalidUserNameOrPasswordAlert];
         }
       });
     });
   }
   else
   {
-    [self showAlert:L(@"no_internet_connection_detected") withButtonTitle:L(@"ok")];
+    [self.alertController presentNoConnectionAlert];
   }
 }
 
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h
index 1031b6f121..22da35120d 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationSignupViewController.h
@@ -1,5 +1,5 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
-@interface MWMAuthorizationSignupViewController : ViewController
+@interface MWMAuthorizationSignupViewController : MWMViewController
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h
index 708d717cb8..fb414e0877 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.h
@@ -1,4 +1,4 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 typedef NS_ENUM(NSUInteger, MWMWebViewAuthorizationType)
 {
@@ -6,7 +6,7 @@ typedef NS_ENUM(NSUInteger, MWMWebViewAuthorizationType)
   MWMWebViewAuthorizationTypeFacebook
 };
 
-@interface MWMAuthorizationWebViewLoginViewController : ViewController
+@interface MWMAuthorizationWebViewLoginViewController : MWMViewController
 
 @property (nonatomic) MWMWebViewAuthorizationType authType;
 
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
index 4f681ca964..2b89d68977 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
@@ -1,3 +1,4 @@
+#import "MWMAlertViewController.h"
 #import "MWMAuthorizationCommon.h"
 #import "MWMAuthorizationWebViewLoginViewController.h"
 #import "MWMCircularProgress.h"
@@ -104,7 +105,7 @@ NSString * getVerifier(NSString * urlString)
       dispatch_async(dispatch_get_main_queue(), ^
       {
         [self stopSpinner];
-        [self showAlert:L(@"dialog_routing_system_error") withButtonTitle:L(@"ok")];
+        [self.alertController presentInternalErrorAlert];
       });
       LOG(LWARNING, ("Can't loadAuthorizationPage", ex.what()));
     }
@@ -154,7 +155,7 @@ NSString * getVerifier(NSString * urlString)
       else
       {
         [self loadAuthorizationPage];
-        [self showAlert:L(@"invalid_username_or_password") withButtonTitle:L(@"ok")];
+        [self.alertController presentInvalidUserNameOrPasswordAlert];
       }
     });
   });
@@ -194,8 +195,7 @@ NSString * getVerifier(NSString * urlString)
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
 {
-  // TODO Rename string
-  [self showAlert:L(@"dialog_routing_system_error") withButtonTitle:L(@"ok")];
+  [self.alertController presentInternalErrorAlert];
 }
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
index f1b40d6a98..f428ba0610 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
@@ -1,5 +1,5 @@
 #import "MWMBottomMenuView.h"
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 #include "platform/location.hpp"
 
@@ -12,7 +12,7 @@
 
 @end
 
-@interface MWMBottomMenuViewController : ViewController
+@interface MWMBottomMenuViewController : MWMViewController
 
 @property(nonatomic) MWMBottomMenuState state;
 @property(weak, nonatomic) IBOutlet MWMButton * p2pButton;
@@ -27,7 +27,6 @@
 - (void)setGo;
 
 - (void)refreshLayout;
-- (void)mwm_refreshUI;
 
 - (void)onLocationStateModeChanged:(location::EMyPositionMode)state;
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h
index 73cdaec2aa..5e539b2748 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMWhatsNewController.h
@@ -1,8 +1,8 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 @class MWMPageController;
 
-@interface MWMWhatsNewController : ViewController
+@interface MWMWhatsNewController : MWMViewController
 
 @property (nonatomic) NSUInteger pageIndex;
 @property (weak, nonatomic) MWMPageController * pageController;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h
index 7df0c6f993..074506e856 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.h
@@ -1,4 +1,4 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 @protocol MWMSearchDownloadProtocol <NSObject>
 
@@ -6,7 +6,7 @@
 
 @end
 
-@interface MWMSearchDownloadViewController : ViewController
+@interface MWMSearchDownloadViewController : MWMViewController
 
 - (nonnull instancetype)init __attribute__((unavailable("init is not available")));
 - (nonnull instancetype)initWithDelegate:(nonnull id<MWMSearchDownloadProtocol>)delegate;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h
index 7ab9cdf5f9..591ac67a19 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.h
@@ -1,8 +1,8 @@
 #import "MWMSearchTabbedViewProtocol.h"
 #import "MWMSearchTabButtonsView.h"
-#import "ViewController.h"
+#import "MWMViewController.h"
 
-@interface MWMSearchTabbedViewController : ViewController
+@interface MWMSearchTabbedViewController : MWMViewController
 
 @property (copy, nonatomic) NSArray * tabButtons;
 @property (weak, nonatomic) NSLayoutConstraint * scrollIndicatorOffset;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h
index f32688129d..acab3cf193 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h
@@ -1,7 +1,7 @@
 #import "MWMSearchManager.h"
-#import "MWMSearchTextField.h"
 #import "MWMSearchTabbedViewProtocol.h"
-#import "ViewController.h"
+#import "MWMSearchTextField.h"
+#import "MWMViewController.h"
 
 @protocol MWMSearchTableViewProtocol <MWMSearchTabbedViewProtocol>
 
@@ -14,7 +14,7 @@
 
 @end
 
-@interface MWMSearchTableViewController : ViewController
+@interface MWMSearchTableViewController : MWMViewController
 
 @property (nonatomic) BOOL searchOnMap;
 
diff --git a/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h b/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h
index d8fd5e22b9..c84e39dcfd 100644
--- a/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h
+++ b/iphone/Maps/Classes/Editor/Cuisine/MWMCuisineEditorViewController.h
@@ -1,4 +1,4 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
 @protocol MWMCuisineEditorProtocol <NSObject>
 
@@ -6,7 +6,7 @@
 
 @end
 
-@interface MWMCuisineEditorViewController : TableViewController
+@interface MWMCuisineEditorViewController : MWMTableViewController
 
 @property (weak, nonatomic) id<MWMCuisineEditorProtocol> delegate;
 
diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.h b/iphone/Maps/Classes/Editor/MWMEditorViewController.h
index 1fdf358e6d..e12939425f 100644
--- a/iphone/Maps/Classes/Editor/MWMEditorViewController.h
+++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.h
@@ -1,8 +1,8 @@
 #import "MWMOpeningHoursEditorViewController.h"
 #import "MWMPlacePageEntity.h"
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface MWMEditorViewController : TableViewController <MWMOpeningHoursEditorProtocol>
+@interface MWMEditorViewController : MWMTableViewController <MWMOpeningHoursEditorProtocol>
 
 @property (nonatomic) MWMPlacePageEntity * entity;
 
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h
index 7a8cca007a..bff585b83a 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h
+++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.h
@@ -1,4 +1,4 @@
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 @protocol MWMOpeningHoursEditorProtocol <NSObject>
 
@@ -6,7 +6,7 @@
 
 @end
 
-@interface MWMOpeningHoursEditorViewController : ViewController
+@interface MWMOpeningHoursEditorViewController : MWMViewController
 
 @property (copy, nonatomic) NSString * openingHours;
 @property (weak, nonatomic) id<MWMOpeningHoursEditorProtocol> delegate;
diff --git a/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h b/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h
index 5133957672..c6ea084c0e 100644
--- a/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h
+++ b/iphone/Maps/Classes/Editor/Street/MWMStreetEditorViewController.h
@@ -1,4 +1,4 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
 @protocol MWMStreetEditorProtocol <NSObject>
 
@@ -9,7 +9,7 @@
 
 @end
 
-@interface MWMStreetEditorViewController : TableViewController
+@interface MWMStreetEditorViewController : MWMTableViewController
 
 @property (weak, nonatomic) id<MWMStreetEditorProtocol> delegate;
 
diff --git a/iphone/Maps/Classes/MWMBookmarkColorViewController.h b/iphone/Maps/Classes/MWMBookmarkColorViewController.h
index 6f73460d15..c51ece0415 100644
--- a/iphone/Maps/Classes/MWMBookmarkColorViewController.h
+++ b/iphone/Maps/Classes/MWMBookmarkColorViewController.h
@@ -1,8 +1,8 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
 @class MWMPlacePageViewManager;
 
-@interface MWMBookmarkColorViewController : TableViewController
+@interface MWMBookmarkColorViewController : MWMTableViewController
 
 @property (weak, nonatomic) MWMPlacePageViewManager * placePageManager;
 @property (weak, nonatomic) UINavigationController * iPadOwnerNavigationController;
diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h
index 9bc18af31b..5e88cfa667 100644
--- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h
+++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.h
@@ -1,9 +1,8 @@
-#import <UIKit/UIKit.h>
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 @class MWMPlacePageViewManager;
 
-@interface MWMBookmarkDescriptionViewController : ViewController
+@interface MWMBookmarkDescriptionViewController : MWMViewController
 
 - (instancetype)initWithPlacePageManager:(MWMPlacePageViewManager *)manager;
 
diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.mm b/iphone/Maps/Classes/MWMiPadPlacePage.mm
index 7ab6d77254..e6f437cc9d 100644
--- a/iphone/Maps/Classes/MWMiPadPlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm
@@ -5,17 +5,17 @@
 #import "MWMiPadPlacePage.h"
 #import "MWMPlacePageActionBar.h"
 #import "MWMPlacePageViewManager.h"
+#import "MWMViewController.h"
 #import "SelectSetVC.h"
 #import "UIColor+MapsMeColor.h"
 #import "UIViewController+Navigation.h"
-#import "ViewController.h"
 
 static CGFloat const kLeftOffset = 12.;
 static CGFloat const kTopOffset = 36.;
 static CGFloat const kBottomOffset = 60.;
 static CGFloat const kKeyboardOffset = 12.;
 
-@interface MWMiPadPlacePageViewController : ViewController
+@interface MWMiPadPlacePageViewController : MWMViewController
 
 @property (nonatomic) UIView * placePageView;
 @property (nonatomic) UIView * actionBarView;
diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index 92c2cb72f0..5547040ae4 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -1,6 +1,6 @@
 #import "LocationManager.h"
 #import "LocationPredictor.h"
-#import "ViewController.h"
+#import "MWMViewController.h"
 #import <MyTargetSDKCorp/MTRGNativeAppwallAd.h>
 
 #include "geometry/point2d.hpp"
@@ -12,7 +12,7 @@ namespace search { struct AddressInfo; }
 @class MWMMapViewControlsManager;
 @class MWMAPIBar;
 
-@interface MapViewController : ViewController <LocationObserver, UIPopoverControllerDelegate>
+@interface MapViewController : MWMViewController <LocationObserver, UIPopoverControllerDelegate>
 {
   CGPoint m_popoverPos;
   
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 69bdf74479..1aea2bbd33 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -13,6 +13,7 @@
 #import "MWMMapViewControlsManager.h"
 #import "MWMPageController.h"
 #import "MWMPlacePageEntity.h"
+#import "MWMTableViewController.h"
 #import "MWMTextToSpeech.h"
 #import "RouteState.h"
 #import "Statistics.h"
@@ -565,7 +566,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue";
         {
           if (connection == Platform::EConnectionType::CONNECTION_WWAN && sizeToDownload > 50 * MB)
           {
-            [self.alertController presentnoWiFiAlertWithName:name downloadBlock:^
+            [self.alertController presentNoWiFiAlertWithName:name downloadBlock:^
             {
               layout.DownloadMap(idx, static_cast<MapOptions>(opt));
             }];
@@ -713,7 +714,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue";
 - (void)openBookmarks
 {
   BOOL const oneCategory = (GetFramework().GetBmCategoriesCount() == 1);
-  TableViewController * vc =
+  MWMTableViewController * vc =
       oneCategory ? [[BookmarksVC alloc] initWithCategory:0] : [[BookmarksRootVC alloc] init];
   [self.navigationController pushViewController:vc animated:YES];
 }
@@ -834,15 +835,6 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue";
   [self.alertController presentRoutingDisclaimerAlert];
 }
 
-#pragma mark - Getters
-
-- (MWMAlertViewController *)alertController
-{
-  if (!_alertController)
-    _alertController = [[MWMAlertViewController alloc] initWithViewController:self];
-  return _alertController;
-}
-
 #pragma mark - Private methods
 
 - (void)destroyPopover
@@ -927,4 +919,9 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue";
   return haveAppWall && haveBanners;
 }
 
+- (BOOL)hasNavigationBar
+{
+  return NO;
+}
+
 @end
diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h
index 58bdb8c8f8..f0198b4109 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.h
+++ b/iphone/Maps/Classes/MapsAppDelegate.h
@@ -1,6 +1,7 @@
 #import "DownloadIndicatorProtocol.h"
 #import "MapsObservers.h"
-#import "NavigationController.h"
+#import "MWMAlertViewController.h"
+#import "MWMNavigationController.h"
 
 #include "indexer/map_style.hpp"
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 03c95a0db3..4261c5d7e3 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -3,11 +3,12 @@
 #import "EAGLView.h"
 #import "LocalNotificationManager.h"
 #import "LocationManager.h"
+#import "MapsAppDelegate.h"
+#import "MapViewController.h"
 #import "MWMAlertViewController.h"
 #import "MWMAuthorizationCommon.h"
+#import "MWMController.h"
 #import "MWMTextToSpeech.h"
-#import "MapViewController.h"
-#import "MapsAppDelegate.h"
 #import "Preferences.h"
 #import "RouteState.h"
 #import "Statistics.h"
@@ -303,7 +304,7 @@ using namespace osm_auth_ios;
     return;
   f.SetMapStyle(MapStyleClear);
   [UIColor setNightMode:NO];
-  [static_cast<ViewController *>(app.mapViewController.navigationController.topViewController) mwm_refreshUI];
+  [static_cast<id<MWMController>>(app.mapViewController.navigationController.topViewController) mwm_refreshUI];
   [app stopMapStyleChecker];
 }
 
@@ -318,7 +319,7 @@ using namespace osm_auth_ios;
   dispatch_async(dispatch_get_main_queue(), [&f, l, self, app]
   {
     auto const dayTime = GetDayTime(static_cast<time_t>(NSDate.date.timeIntervalSince1970), l.coordinate.latitude, l.coordinate.longitude);
-    ViewController * vc = static_cast<ViewController *>(app.mapViewController.navigationController.topViewController);
+    id<MWMController> vc = static_cast<id<MWMController>>(app.mapViewController.navigationController.topViewController);
     auto style = f.GetMapStyle();
     switch (dayTime)
     {
diff --git a/iphone/Maps/Classes/NavigationController.h b/iphone/Maps/Classes/NavigationController.h
deleted file mode 100644
index 9cd27f150a..0000000000
--- a/iphone/Maps/Classes/NavigationController.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#import <UIKit/UIKit.h>
-
-@interface NavigationController : UINavigationController
-
-@end
diff --git a/iphone/Maps/Classes/NavigationController.mm b/iphone/Maps/Classes/NavigationController.mm
deleted file mode 100644
index 515cbdf208..0000000000
--- a/iphone/Maps/Classes/NavigationController.mm
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#import "NavigationController.h"
-#import "MapsAppDelegate.h"
-#import "UIViewController+Navigation.h"
-#import "MapViewController.h"
-
-@interface NavigationController () <UINavigationControllerDelegate>
-
-@end
-
-@implementation NavigationController
-
-- (UIStatusBarStyle)preferredStatusBarStyle
-{
-  return UIStatusBarStyleLightContent;
-}
-
-- (void)viewDidLoad
-{
-  [super viewDidLoad];
-  self.delegate = self;
-}
-
-- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated
-{
-  [navigationController setNavigationBarHidden:[viewController isMemberOfClass:[MapViewController class]] animated:animated];
-
-  if ([navigationController.viewControllers count] > 1)
-    [viewController showBackButton];
-}
-
-@end
diff --git a/iphone/Maps/CommunityVC.h b/iphone/Maps/CommunityVC.h
index 29a7df1f9b..d52a00e57d 100644
--- a/iphone/Maps/CommunityVC.h
+++ b/iphone/Maps/CommunityVC.h
@@ -1,7 +1,5 @@
+#import "MWMTableViewController.h"
 
-#import <UIKit/UIKit.h>
-#import "TableViewController.h"
-
-@interface CommunityVC : TableViewController
+@interface CommunityVC : MWMTableViewController
 
 @end
diff --git a/iphone/Maps/DownloaderParentVC.h b/iphone/Maps/DownloaderParentVC.h
index b101bfa5cd..d62061c096 100644
--- a/iphone/Maps/DownloaderParentVC.h
+++ b/iphone/Maps/DownloaderParentVC.h
@@ -1,8 +1,6 @@
-
-#import <UIKit/UIKit.h>
 #import "MapsObservers.h"
 #import "MapCell.h"
-#import "ViewController.h"
+#import "MWMViewController.h"
 
 #include "storage/storage_defines.hpp"
 #include "platform/preferred_languages.hpp"
@@ -17,7 +15,7 @@ typedef NS_ENUM(NSUInteger, DownloaderAction)
 
 using namespace storage;
 
-@interface DownloaderParentVC : ViewController <MapCellDelegate, UIActionSheetDelegate, UIAlertViewDelegate, UITableViewDataSource, UITableViewDelegate>
+@interface DownloaderParentVC : MWMViewController <MapCellDelegate, UIActionSheetDelegate, UIAlertViewDelegate, UITableViewDataSource, UITableViewDelegate>
 
 - (BOOL)canDownloadSelectedMap;
 - (UIActionSheet *)actionSheetToCancelDownloadingSelectedMap;
diff --git a/iphone/Maps/DownloaderParentVC.mm b/iphone/Maps/DownloaderParentVC.mm
index fe2960db1b..b228549598 100644
--- a/iphone/Maps/DownloaderParentVC.mm
+++ b/iphone/Maps/DownloaderParentVC.mm
@@ -66,7 +66,7 @@
   if (connection != Platform::EConnectionType::CONNECTION_NONE)
   {
     if (connection == Platform::EConnectionType::CONNECTION_WWAN && size > 50 * MB)
-      [alert presentnoWiFiAlertWithName:name downloadBlock:^{[self download];}];
+      [alert presentNoWiFiAlertWithName:name downloadBlock:^{[self download];}];
     else
       return YES;
   }
diff --git a/iphone/Maps/MWMNightModeController.h b/iphone/Maps/MWMNightModeController.h
index 4844f9114c..27b77f6f56 100644
--- a/iphone/Maps/MWMNightModeController.h
+++ b/iphone/Maps/MWMNightModeController.h
@@ -1,5 +1,5 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface MWMNightModeController : TableViewController
+@interface MWMNightModeController : MWMTableViewController
 
 @end
diff --git a/iphone/Maps/MWMRecentTrackSettingsController.h b/iphone/Maps/MWMRecentTrackSettingsController.h
index 8a08bca1a7..4266571020 100644
--- a/iphone/Maps/MWMRecentTrackSettingsController.h
+++ b/iphone/Maps/MWMRecentTrackSettingsController.h
@@ -1,5 +1,5 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface MWMRecentTrackSettingsController : TableViewController
+@interface MWMRecentTrackSettingsController : MWMTableViewController
 
 @end
diff --git a/iphone/Maps/MWMTTSLanguageViewController.h b/iphone/Maps/MWMTTSLanguageViewController.h
index 1530c6f92a..a7b6a64ac2 100644
--- a/iphone/Maps/MWMTTSLanguageViewController.h
+++ b/iphone/Maps/MWMTTSLanguageViewController.h
@@ -1,5 +1,5 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface MWMTTSLanguageViewController : TableViewController
+@interface MWMTTSLanguageViewController : MWMTableViewController
 
 @end
diff --git a/iphone/Maps/MWMTTSSettingsViewController.h b/iphone/Maps/MWMTTSSettingsViewController.h
index 29035fbe6d..410b630a22 100644
--- a/iphone/Maps/MWMTTSSettingsViewController.h
+++ b/iphone/Maps/MWMTTSSettingsViewController.h
@@ -1,6 +1,6 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface MWMTTSSettingsViewController : TableViewController
+@interface MWMTTSSettingsViewController : MWMTableViewController
 
 - (void)setAdditionalTTSLanguage:(std::pair<string, string> const &)l;
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 94df410604..40483c3e99 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -137,6 +137,8 @@
 		3491E7CE1C06F1F10042FE24 /* MWMPlacePageButtonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3491E7CA1C06F1F10042FE24 /* MWMPlacePageButtonCell.xib */; };
 		34921F6A1BFA0CDC00737D6E /* MyTargetSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34921F691BFA0CDC00737D6E /* MyTargetSDKCorp.framework */; };
 		34921F6B1BFA0CDC00737D6E /* MyTargetSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34921F691BFA0CDC00737D6E /* MyTargetSDKCorp.framework */; };
+		3492CC121C6DF00E0057D8E8 /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; };
+		3492CC131C6DF00F0057D8E8 /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; };
 		3497A93A1B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */; };
 		349A357A1B53D4C9009677EE /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; };
 		349A357B1B53D4C9009677EE /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; };
@@ -195,6 +197,12 @@
 		34BF0CC61C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; };
 		34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; };
 		34C659471BD12A77009DC20A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34C659451BD12A77009DC20A /* InfoPlist.strings */; };
+		34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; };
+		34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; };
+		34C9BD041C6DB693000DC38D /* MWMViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.mm */; };
+		34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.mm */; };
+		34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */; };
+		34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */; };
 		34CA57181C292F17004D9C89 /* MyTrackerSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F696CCBA1C2816FB00150DFD /* MyTrackerSDKCorp.framework */; };
 		34CA57191C292F50004D9C89 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */; };
 		34CC4C091B81F3B500E44C1F /* MWMSearchTabbedViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */; };
@@ -376,7 +384,6 @@
 		6741A9C41BF340DE002C974C /* MWMRouteHelperPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = F68E6BD11B8DB7AE0040566D /* MWMRouteHelperPanel.mm */; };
 		6741A9C51BF340DE002C974C /* MWMZoomButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */; };
 		6741A9C61BF340DE002C974C /* MWMSearchCommonCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82ADC1B84A4A000180497 /* MWMSearchCommonCell.mm */; };
-		6741A9C71BF340DE002C974C /* NavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9252183BD530000D6C7C /* NavigationController.mm */; };
 		6741A9C81BF340DE002C974C /* MWMiPhoneLandscapePlacePage.mm in Sources */ = {isa = PBXBuildFile; fileRef = F66A8FA71B09F052001B9C97 /* MWMiPhoneLandscapePlacePage.mm */; };
 		6741A9C91BF340DE002C974C /* ToastView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974386DC19373EA400FD5659 /* ToastView.mm */; };
 		6741A9CA1BF340DE002C974C /* MWMAnimator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6C9343B1AE4F94A00DDC624 /* MWMAnimator.mm */; };
@@ -440,7 +447,6 @@
 		6741AA051BF340DE002C974C /* MWMSearchDownloadViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344825911B8DBADF00757B1B /* MWMSearchDownloadViewController.mm */; };
 		6741AA061BF340DE002C974C /* MWMSearchHistoryRequestCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82AB81B837FFD00180497 /* MWMSearchHistoryRequestCell.mm */; };
 		6741AA071BF340DE002C974C /* MWMBottomMenuLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BAB6E81BB2DA0C00DB941B /* MWMBottomMenuLayout.mm */; };
-		6741AA081BF340DE002C974C /* TableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA2A1A515B4C0086819E /* TableViewController.mm */; };
 		6741AA091BF340DE002C974C /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; };
 		6741AA0A1BF340DE002C974C /* MWMBottomMenuCollectionViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BAB6EB1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm */; };
 		6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
@@ -464,8 +470,6 @@
 		6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; };
 		6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.mm */; };
 		6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B82ACE1B846B2C00180497 /* MWMSearchBookmarksCell.mm */; };
-		6741AA201BF340DE002C974C /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; };
-		6741AA211BF340DE002C974C /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA261A515AFD0086819E /* ViewController.mm */; };
 		6741AA221BF340DE002C974C /* MWMNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33831B6240F200F2CE18 /* MWMNavigationView.mm */; };
 		6741AA231BF340DE002C974C /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; };
 		6741AA241BF340DE002C974C /* UIButton+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.mm */; };
@@ -549,7 +553,6 @@
 		9747278418338F0C006B7CB7 /* UIViewController+Navigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.mm */; };
 		974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */; };
 		97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97508422199522D300A7457D /* SettingsAndMoreVC.mm */; };
-		976D86EC19C8697700C920EF /* ProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.mm */; };
 		976D86F119C877E600C920EF /* MapCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 976D86F019C877E600C920EF /* MapCell.mm */; };
 		97719D451843B6DC00BDD815 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D441843B6DC00BDD815 /* MessageUI.framework */; };
 		97719D491843B6F700BDD815 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D471843B6F200BDD815 /* Security.framework */; };
@@ -563,7 +566,6 @@
 		978F9240183B660F000D6C7C /* SettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9239183B660F000D6C7C /* SettingsViewController.mm */; };
 		978F9242183B660F000D6C7C /* SelectableCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923A183B660F000D6C7C /* SelectableCell.mm */; };
 		978F9244183B660F000D6C7C /* SwitchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F923B183B660F000D6C7C /* SwitchCell.mm */; };
-		978F9253183BD530000D6C7C /* NavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9252183BD530000D6C7C /* NavigationController.mm */; };
 		97A5967F19B9CD47007A963F /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; };
 		97C98522186AE3CF00AF7E9E /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97C98520186AE3CF00AF7E9E /* AppInfo.mm */; };
 		97D40C0A184D031900A1D572 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97D40C09184D031900A1D572 /* Images.xcassets */; };
@@ -597,8 +599,6 @@
 		B08AA8D61A25E58C00810B1C /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864D186C5ED300AF7E9E /* Social.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		B08AA8DA1A26299A00810B1C /* TimeUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = B08AA8D91A26299A00810B1C /* TimeUtils.mm */; };
 		B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */ = {isa = PBXBuildFile; fileRef = B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */; };
-		B0FBFA271A515AFD0086819E /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA261A515AFD0086819E /* ViewController.mm */; };
-		B0FBFA2B1A515B4C0086819E /* TableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA2A1A515B4C0086819E /* TableViewController.mm */; };
 		CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; };
 		ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; };
 		ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.mm */; };
@@ -1002,6 +1002,13 @@
 		34C659491BD12A81009DC20A /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		34C6594A1BD12A89009DC20A /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		34C6594B1BD12A89009DC20A /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewController.h; sourceTree = "<group>"; };
+		34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTableViewController.mm; sourceTree = "<group>"; };
+		34C9BD001C6DB693000DC38D /* MWMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMViewController.h; sourceTree = "<group>"; };
+		34C9BD011C6DB693000DC38D /* MWMViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMViewController.mm; sourceTree = "<group>"; };
+		34C9BD061C6DB6F3000DC38D /* MWMController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMController.h; sourceTree = "<group>"; };
+		34C9BD071C6DBCDA000DC38D /* MWMNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationController.h; sourceTree = "<group>"; };
+		34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationController.mm; sourceTree = "<group>"; };
 		34CC4C061B81F3B500E44C1F /* MWMSearchTabbedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewController.h; sourceTree = "<group>"; };
 		34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTabbedViewController.mm; sourceTree = "<group>"; };
 		34CC4C081B81F3B500E44C1F /* MWMSearchTabbedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTabbedViewController.xib; sourceTree = "<group>"; };
@@ -1139,8 +1146,6 @@
 		978F923D183B660F000D6C7C /* SwitchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwitchCell.h; path = Settings/SwitchCell.h; sourceTree = "<group>"; };
 		978F923E183B660F000D6C7C /* SelectableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCell.h; path = Settings/SelectableCell.h; sourceTree = "<group>"; };
 		978F923F183B660F000D6C7C /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SettingsViewController.h; path = Settings/SettingsViewController.h; sourceTree = "<group>"; };
-		978F9251183BD530000D6C7C /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationController.h; sourceTree = "<group>"; };
-		978F9252183BD530000D6C7C /* NavigationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigationController.mm; sourceTree = "<group>"; };
 		97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; };
 		97C98520186AE3CF00AF7E9E /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppInfo.mm; sourceTree = "<group>"; };
 		97C98521186AE3CF00AF7E9E /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = "<group>"; };
@@ -1180,10 +1185,6 @@
 		B08AA8D81A26299A00810B1C /* TimeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeUtils.h; path = Categories/TimeUtils.h; sourceTree = "<group>"; };
 		B08AA8D91A26299A00810B1C /* TimeUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TimeUtils.mm; path = Categories/TimeUtils.mm; sourceTree = "<group>"; };
 		B0DFE6301A1B78A200B6C35E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = en.lproj/LocalNotifications.plist; sourceTree = "<group>"; };
-		B0FBFA251A515AFD0086819E /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewController.h; path = ../ViewController.h; sourceTree = "<group>"; };
-		B0FBFA261A515AFD0086819E /* ViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ViewController.mm; path = ../ViewController.mm; sourceTree = "<group>"; };
-		B0FBFA291A515B4C0086819E /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableViewController.h; path = ../TableViewController.h; sourceTree = "<group>"; };
-		B0FBFA2A1A515B4C0086819E /* TableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TableViewController.mm; path = ../TableViewController.mm; sourceTree = "<group>"; };
 		CB252D6B16FF82C8001E41E9 /* Statistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Statistics.h; sourceTree = "<group>"; };
 		CB252D6C16FF82C8001E41E9 /* Statistics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Statistics.mm; sourceTree = "<group>"; };
 		ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = "<group>"; };
@@ -1540,14 +1541,8 @@
 				974D041C1977DE430081D0A7 /* LocalNotificationManager.h */,
 				974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */,
 				B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */,
-				B0FBFA251A515AFD0086819E /* ViewController.h */,
-				B0FBFA261A515AFD0086819E /* ViewController.mm */,
 				F626D52C1C3E6CAA00C17D15 /* MWMTableViewCell.h */,
 				F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.mm */,
-				B0FBFA291A515B4C0086819E /* TableViewController.h */,
-				B0FBFA2A1A515B4C0086819E /* TableViewController.mm */,
-				978F9251183BD530000D6C7C /* NavigationController.h */,
-				978F9252183BD530000D6C7C /* NavigationController.mm */,
 				46F26CD610F623BA00ECCA39 /* EAGLView.h */,
 				46F26CD710F623BA00ECCA39 /* EAGLView.mm */,
 				1D3623240D0F684500981E51 /* MapsAppDelegate.h */,
@@ -1802,6 +1797,13 @@
 				F6791B121C43DEA7007A8A6E /* MWMStartButton.mm */,
 				F6FEA82B1C58E89B007223CC /* MWMButton.h */,
 				F6FEA82C1C58E89B007223CC /* MWMButton.mm */,
+				34C9BD061C6DB6F3000DC38D /* MWMController.h */,
+				34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */,
+				34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */,
+				34C9BD001C6DB693000DC38D /* MWMViewController.h */,
+				34C9BD011C6DB693000DC38D /* MWMViewController.mm */,
+				34C9BD071C6DBCDA000DC38D /* MWMNavigationController.h */,
+				34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -3225,7 +3227,6 @@
 				34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */,
 				340C20E31C3E565600111D22 /* MWMCuisineEditorViewController.mm in Sources */,
 				34B82ADE1B84A4A000180497 /* MWMSearchCommonCell.mm in Sources */,
-				978F9253183BD530000D6C7C /* NavigationController.mm in Sources */,
 				F66A8FA81B09F052001B9C97 /* MWMiPhoneLandscapePlacePage.mm in Sources */,
 				974386DD19373EA400FD5659 /* ToastView.mm in Sources */,
 				F6C9343C1AE4F94A00DDC624 /* MWMAnimator.mm in Sources */,
@@ -3236,6 +3237,7 @@
 				34CFFE8B1B7DE6FD009D0C9F /* MWMSearchManager.mm in Sources */,
 				34ABA62C1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */,
 				34ABA6161C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */,
+				3492CC121C6DF00E0057D8E8 /* ProgressView.mm in Sources */,
 				F6BBF2C61B4FFB72000CF8E2 /* MWMLocationAlert.mm in Sources */,
 				F66A8FB01B09F268001B9C97 /* MWMPlacePage.mm in Sources */,
 				F6ED13911B1EF96B0095C6DE /* MWMBookmarkDescriptionViewController.mm in Sources */,
@@ -3243,7 +3245,9 @@
 				F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */,
 				FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */,
 				34181EA11C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */,
+				34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */,
 				340C21111C3FFE3100111D22 /* MWMCuisineEditorTableViewCell.mm in Sources */,
+				34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */,
 				F63BA3711BCD5B520044C504 /* MWMTTSLanguageViewController.mm in Sources */,
 				F64DA8021C524BDE00330E9E /* UISwitch+RuntimeAttributes.m in Sources */,
 				F607C18E1C047FDC00B53A87 /* MWMSegue.mm in Sources */,
@@ -3315,7 +3319,6 @@
 				345FDD261C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */,
 				34B82ABA1B837FFD00180497 /* MWMSearchHistoryRequestCell.mm in Sources */,
 				34BAB6E91BB2DA0C00DB941B /* MWMBottomMenuLayout.mm in Sources */,
-				B0FBFA2B1A515B4C0086819E /* TableViewController.mm in Sources */,
 				F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */,
 				34BAB6ED1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewCell.mm in Sources */,
 				34CCFDE01C22A2EF00F28959 /* MWMPlacePageOpeningHoursCell.mm in Sources */,
@@ -3334,6 +3337,7 @@
 				34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.mm in Sources */,
 				F6F533A31B3C248900C1940B /* UIColor+MapsMeColor.mm in Sources */,
 				346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */,
+				34C9BD041C6DB693000DC38D /* MWMViewController.mm in Sources */,
 				CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */,
 				F6D5822D1BFDB7C6009409E8 /* MWMPageController.mm in Sources */,
 				6BA0BCD11B74DDBA00CC9969 /* MWMCustomFacebookEvents.mm in Sources */,
@@ -3349,8 +3353,6 @@
 				F64F19A31AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm in Sources */,
 				97F61794183E7445009919E2 /* LinkCell.mm in Sources */,
 				34B82AD01B846B2C00180497 /* MWMSearchBookmarksCell.mm in Sources */,
-				976D86EC19C8697700C920EF /* ProgressView.mm in Sources */,
-				B0FBFA271A515AFD0086819E /* ViewController.mm in Sources */,
 				F6BD33841B6240F200F2CE18 /* MWMNavigationView.mm in Sources */,
 				3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */,
 				342AD76F1B53D30C00E0B997 /* UIButton+RuntimeAttributes.mm in Sources */,
@@ -3418,7 +3420,6 @@
 				6741A9C51BF340DE002C974C /* MWMZoomButtons.mm in Sources */,
 				6741A9C61BF340DE002C974C /* MWMSearchCommonCell.mm in Sources */,
 				34ABA6351C2D64D400FE1BEC /* MWMAuthorizationForgottenPasswordViewController.mm in Sources */,
-				6741A9C71BF340DE002C974C /* NavigationController.mm in Sources */,
 				340C20E41C3E565600111D22 /* MWMCuisineEditorViewController.mm in Sources */,
 				6741A9C81BF340DE002C974C /* MWMiPhoneLandscapePlacePage.mm in Sources */,
 				6741A9C91BF340DE002C974C /* ToastView.mm in Sources */,
@@ -3434,11 +3435,14 @@
 				34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */,
 				34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */,
 				6741A9D01BF340DE002C974C /* MWMPlacePage.mm in Sources */,
+				3492CC131C6DF00F0057D8E8 /* ProgressView.mm in Sources */,
 				6741A9D21BF340DE002C974C /* MWMBookmarkDescriptionViewController.mm in Sources */,
 				6741A9D31BF340DE002C974C /* MWMDownloadMapRequestView.mm in Sources */,
 				3476B8CC1BFDCB6700874594 /* MWMTTSSettingsViewController.mm in Sources */,
 				6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */,
+				34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */,
 				6741A9D51BF340DE002C974C /* WebViewController.mm in Sources */,
+				34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */,
 				6741A9D61BF340DE002C974C /* MWMPlacePageNavigationBar.mm in Sources */,
 				340C21121C3FFE3100111D22 /* MWMCuisineEditorTableViewCell.mm in Sources */,
 				6741A9D71BF340DE002C974C /* MWMRouteHelperPanelsDrawer.mm in Sources */,
@@ -3509,7 +3513,6 @@
 				3401CD681C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm in Sources */,
 				6741AA071BF340DE002C974C /* MWMBottomMenuLayout.mm in Sources */,
 				3401CD771C3CED1E0028C6F8 /* MWMEditorSelectTableViewCell.mm in Sources */,
-				6741AA081BF340DE002C974C /* TableViewController.mm in Sources */,
 				34181E9E1C0ECF210081B586 /* MWMOpeningHoursDaysSelectorTableViewCell.mm in Sources */,
 				345FDD271C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */,
 				6741AA091BF340DE002C974C /* BookmarkCell.mm in Sources */,
@@ -3531,6 +3534,7 @@
 				6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */,
 				34181EB01C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */,
 				6741AA151BF340DE002C974C /* Statistics.mm in Sources */,
+				34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */,
 				6741AA161BF340DE002C974C /* MWMCustomFacebookEvents.mm in Sources */,
 				6741AA171BF340DE002C974C /* SwitchCell.mm in Sources */,
 				6741AA181BF340DE002C974C /* UIView+RuntimeAttributes.mm in Sources */,
@@ -3544,8 +3548,6 @@
 				6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */,
 				6741AA1E1BF340DE002C974C /* LinkCell.mm in Sources */,
 				6741AA1F1BF340DE002C974C /* MWMSearchBookmarksCell.mm in Sources */,
-				6741AA201BF340DE002C974C /* ProgressView.mm in Sources */,
-				6741AA211BF340DE002C974C /* ViewController.mm in Sources */,
 				6741AA221BF340DE002C974C /* MWMNavigationView.mm in Sources */,
 				6741AA231BF340DE002C974C /* UIFont+MapsMeFonts.mm in Sources */,
 				674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */,
diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard
index 062fed3c01..55f2f25e34 100644
--- a/iphone/Maps/Mapsme.storyboard
+++ b/iphone/Maps/Mapsme.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Wns-nH-AQU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Wns-nH-AQU">
     <dependencies>
         <deployment version="2048" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -41,7 +41,7 @@
         <!--Navigation Controller-->
         <scene sceneID="lCi-qJ-2rn">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Wns-nH-AQU" customClass="NavigationController" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Wns-nH-AQU" customClass="MWMNavigationController" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="OK2-RC-YDq">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -66,10 +66,10 @@
                         <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="6zO-4O-plh" customClass="SelectableCell">
-                                <rect key="frame" x="0.0" y="113" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="114" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6zO-4O-plh" id="9W6-2l-MFB">
-                                    <rect key="frame" x="0.0" y="0.0" width="561" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="561" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Metrics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="fhF-kM-tcR">
@@ -97,10 +97,10 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="5Ht-CR-a67" customClass="SwitchCell">
-                                <rect key="frame" x="0.0" y="157" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="158" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Ht-CR-a67" id="egv-pz-GkJ">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Statistics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="HGH-S1-QeY">
@@ -144,10 +144,10 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="yh8-cr-14c" customClass="LinkCell">
-                                <rect key="frame" x="0.0" y="201" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="202" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yh8-cr-14c" id="MYm-HI-oOR">
-                                    <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="567" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="About" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="8jb-wX-P4h">
@@ -208,7 +208,7 @@
                                         <rect key="frame" x="0.0" y="35" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hgm-jL-Gnn" id="LeE-yP-Eoi">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="sHx-XL-o9h">
@@ -241,7 +241,7 @@
                                         <rect key="frame" x="0.0" y="79" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WyO-qs-a7i" id="q2k-AU-VdG">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="um4-D2-sR5">
@@ -274,7 +274,7 @@
                                         <rect key="frame" x="0.0" y="123" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HHw-BT-UeJ" id="WD5-kW-BlC">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Off" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="abU-K0-dr3">
@@ -336,7 +336,7 @@
                                         <rect key="frame" x="0.0" y="35" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HL5-jQ-yNK" id="DYw-KH-oDU">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="None" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="2i3-c9-tdU">
@@ -369,7 +369,7 @@
                                         <rect key="frame" x="0.0" y="79" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8Cq-dm-roX" id="62b-vT-xng">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 hour" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="J1O-iW-GF3">
@@ -402,7 +402,7 @@
                                         <rect key="frame" x="0.0" y="123" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DIL-q2-mUp" id="IqW-Xu-xVP">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="55i-C3-b9S">
@@ -435,7 +435,7 @@
                                         <rect key="frame" x="0.0" y="167" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Mm-WA-eyt" id="lNb-wL-PFo">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="QrP-xT-fcM">
@@ -468,7 +468,7 @@
                                         <rect key="frame" x="0.0" y="211" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JLY-Qt-y88" id="jPr-Kt-mLi">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="HyC-if-zpD">
@@ -501,7 +501,7 @@
                                         <rect key="frame" x="0.0" y="255" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mbv-1J-wSI" id="oPS-HW-hfW">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 day" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="uhN-0k-BL7">
@@ -534,7 +534,7 @@
                                         <rect key="frame" x="0.0" y="299" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="js7-Hu-EdJ" id="8rz-AY-REp">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2 days" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="b4c-Ji-Ctk">
@@ -590,10 +590,10 @@
                         <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="79I-kz-hl4" customClass="SelectableCell">
-                                <rect key="frame" x="0.0" y="49" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="50" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="79I-kz-hl4" id="gBB-ji-big">
-                                    <rect key="frame" x="0.0" y="0.0" width="561" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="561" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Русский" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="FSn-fP-n3e">
@@ -622,10 +622,10 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="lO6-zb-qb8" customClass="LinkCell">
-                                <rect key="frame" x="0.0" y="93" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="94" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lO6-zb-qb8" id="35k-Nb-XSD">
-                                    <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="567" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="arm-Sx-diY">
@@ -679,10 +679,10 @@
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="6Px-TO-sMc" customClass="SelectableCell">
-                                <rect key="frame" x="0.0" y="49" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="50" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Px-TO-sMc" id="aqp-aV-B3y">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Русский" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="516" translatesAutoresizingMaskIntoConstraints="NO" id="wBg-nH-SXL">
diff --git a/iphone/Maps/Settings/SettingsViewController.h b/iphone/Maps/Settings/SettingsViewController.h
index 7df8283ab0..c452c9f6b5 100644
--- a/iphone/Maps/Settings/SettingsViewController.h
+++ b/iphone/Maps/Settings/SettingsViewController.h
@@ -1,7 +1,5 @@
+#import "MWMTableViewController.h"
 
-#import <UIKit/UIKit.h>
-#import "TableViewController.h"
-
-@interface SettingsViewController : TableViewController
+@interface SettingsViewController : MWMTableViewController
 
 @end
diff --git a/iphone/Maps/SettingsAndMoreVC.h b/iphone/Maps/SettingsAndMoreVC.h
index 1d98407c74..13e2bd5013 100644
--- a/iphone/Maps/SettingsAndMoreVC.h
+++ b/iphone/Maps/SettingsAndMoreVC.h
@@ -1,5 +1,5 @@
-#import "TableViewController.h"
+#import "MWMTableViewController.h"
 
-@interface SettingsAndMoreVC : TableViewController
+@interface SettingsAndMoreVC : MWMTableViewController
 
 @end
diff --git a/iphone/Maps/TableViewController.h b/iphone/Maps/TableViewController.h
deleted file mode 100644
index da12987fbc..0000000000
--- a/iphone/Maps/TableViewController.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface TableViewController : UITableViewController
-
-- (void)mwm_refreshUI;
-
-@end
diff --git a/iphone/Maps/ViewController.h b/iphone/Maps/ViewController.h
deleted file mode 100644
index a5e8d82318..0000000000
--- a/iphone/Maps/ViewController.h
+++ /dev/null
@@ -1,6 +0,0 @@
-@interface ViewController : UIViewController
-
-- (void)mwm_refreshUI;
-- (void)showAlert:(NSString *)alert withButtonTitle:(NSString *)buttonTitle;
-
-@end
diff --git a/iphone/Maps/ViewController.mm b/iphone/Maps/ViewController.mm
deleted file mode 100644
index 6a71c20ddd..0000000000
--- a/iphone/Maps/ViewController.mm
+++ /dev/null
@@ -1,64 +0,0 @@
-#import "Common.h"
-#import "MapsAppDelegate.h"
-#import "MapViewController.h"
-#import "ViewController.h"
-#import "3party/Alohalytics/src/alohalytics_objc.h"
-
-@implementation ViewController
-
-- (BOOL)prefersStatusBarHidden
-{
-  return NO;
-}
-
-- (void)mwm_refreshUI
-{
-  [self.navigationController.navigationBar mwm_refreshUI];
-  [self.view mwm_refreshUI];
-  if (![self isKindOfClass:[MapViewController class]])
-    [[MapsAppDelegate theApp].mapViewController mwm_refreshUI];
-}
-
-- (void)viewDidLoad
-{
-  [super viewDidLoad];
-  [self.navigationController.navigationBar setTranslucent:NO];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-  [Alohalytics logEvent:@"$viewWillAppear" withValue:NSStringFromClass([self class])];
-  [super viewWillAppear:animated];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-  [Alohalytics logEvent:@"$viewWillDisappear" withValue:NSStringFromClass([self class])];
-  [super viewWillDisappear:animated];
-}
-
-- (void)showAlert:(NSString *)alert withButtonTitle:(NSString *)buttonTitle
-{
-  if (isIOS7)
-  {
-    UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:alert
-                                                         message:nil
-                                                        delegate:nil
-                                               cancelButtonTitle:buttonTitle
-                                               otherButtonTitles:nil];
-    [alertView show];
-  }
-  else
-  {
-    UIAlertController * alertController =
-        [UIAlertController alertControllerWithTitle:alert
-                                            message:nil
-                                     preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction * okAction =
-        [UIAlertAction actionWithTitle:buttonTitle style:UIAlertActionStyleCancel handler:nil];
-    [alertController addAction:okAction];
-    [self presentViewController:alertController animated:YES completion:nil];
-  }
-}
-
-@end
\ No newline at end of file
diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj
index ca573c0822..9a87251e44 100644
--- a/xcode/geometry/geometry.xcodeproj/project.pbxproj
+++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		347F33701C454205009758CC /* triangle2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F336E1C454205009758CC /* triangle2d.cpp */; };
 		347F33711C454205009758CC /* triangle2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F336F1C454205009758CC /* triangle2d.hpp */; };
+		3492CC161C6DF05A0057D8E8 /* segment2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC141C6DF05A0057D8E8 /* segment2d.cpp */; };
+		3492CC171C6DF05A0057D8E8 /* segment2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC151C6DF05A0057D8E8 /* segment2d.hpp */; };
 		670F296A1BA9D3C200F2ABF4 /* equality.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29291BA9D2E700F2ABF4 /* equality.hpp */; };
 		670F296C1BA9D3C200F2ABF4 /* large_polygon.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292B1BA9D2E700F2ABF4 /* large_polygon.hpp */; };
 		670F297A1BA9D3C200F2ABF4 /* test_regions.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29391BA9D2E700F2ABF4 /* test_regions.hpp */; };
@@ -93,6 +95,8 @@
 /* Begin PBXFileReference section */
 		347F336E1C454205009758CC /* triangle2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = triangle2d.cpp; sourceTree = "<group>"; };
 		347F336F1C454205009758CC /* triangle2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = triangle2d.hpp; sourceTree = "<group>"; };
+		3492CC141C6DF05A0057D8E8 /* segment2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment2d.cpp; sourceTree = "<group>"; };
+		3492CC151C6DF05A0057D8E8 /* segment2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = segment2d.hpp; sourceTree = "<group>"; };
 		670D05A51B0E01FF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		670F29221BA9D2E700F2ABF4 /* angle_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = angle_test.cpp; sourceTree = "<group>"; };
 		670F29231BA9D2E700F2ABF4 /* anyrect_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anyrect_test.cpp; sourceTree = "<group>"; };
@@ -254,6 +258,8 @@
 		675344931A3F684600A0A8C3 /* geometry */ = {
 			isa = PBXGroup;
 			children = (
+				3492CC141C6DF05A0057D8E8 /* segment2d.cpp */,
+				3492CC151C6DF05A0057D8E8 /* segment2d.hpp */,
 				347F336E1C454205009758CC /* triangle2d.cpp */,
 				347F336F1C454205009758CC /* triangle2d.hpp */,
 				E92D8BD21C15AFAA00A98D17 /* mercator.cpp */,
@@ -315,6 +321,7 @@
 				675344E01A3F68F900A0A8C3 /* boost_concept.hpp in Headers */,
 				675344C01A3F687400A0A8C3 /* cellid.hpp in Headers */,
 				675344CB1A3F687400A0A8C3 /* polyline2d.hpp in Headers */,
+				3492CC171C6DF05A0057D8E8 /* segment2d.hpp in Headers */,
 				675344D21A3F687400A0A8C3 /* screenbase.hpp in Headers */,
 				E92D8BD51C15AFAA00A98D17 /* mercator.hpp in Headers */,
 				675344BF1A3F687400A0A8C3 /* avg_vector.hpp in Headers */,
@@ -464,6 +471,7 @@
 				E92D8BD11C15AF9100A98D17 /* mercator_test.cpp in Sources */,
 				675344C61A3F687400A0A8C3 /* packer.cpp in Sources */,
 				675344DE1A3F68F900A0A8C3 /* binary_operators.cpp in Sources */,
+				3492CC161C6DF05A0057D8E8 /* segment2d.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj
index 5347ac489e..a076c925ed 100644
--- a/xcode/platform/platform.xcodeproj/project.pbxproj
+++ b/xcode/platform/platform.xcodeproj/project.pbxproj
@@ -7,6 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3492CC221C6DF0CC0057D8E8 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC1E1C6DF0CC0057D8E8 /* mwm_traits.cpp */; };
+		3492CC231C6DF0CC0057D8E8 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC1F1C6DF0CC0057D8E8 /* mwm_traits.hpp */; };
+		3492CC241C6DF0CC0057D8E8 /* file_logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC201C6DF0CC0057D8E8 /* file_logging.cpp */; };
+		3492CC251C6DF0CC0057D8E8 /* file_logging.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC211C6DF0CC0057D8E8 /* file_logging.hpp */; };
 		670E8C761BB318AB00094197 /* platform_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C741BB318AB00094197 /* platform_ios.mm */; };
 		670E8C911BB31A2F00094197 /* ios_video_timer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C901BB31A2F00094197 /* ios_video_timer.mm */; };
 		671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62041AE9014C00076BD0 /* measurement_utils.cpp */; };
@@ -96,6 +100,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		3492CC1E1C6DF0CC0057D8E8 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
+		3492CC1F1C6DF0CC0057D8E8 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
+		3492CC201C6DF0CC0057D8E8 /* file_logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_logging.cpp; sourceTree = "<group>"; };
+		3492CC211C6DF0CC0057D8E8 /* file_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file_logging.hpp; sourceTree = "<group>"; };
 		670D05A71B0E03BF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		670E8C741BB318AB00094197 /* platform_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_ios.mm; sourceTree = "<group>"; };
 		670E8C901BB31A2F00094197 /* ios_video_timer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ios_video_timer.mm; sourceTree = "<group>"; };
@@ -289,6 +297,10 @@
 		6753437A1A3F5CF500A0A8C3 /* platform */ = {
 			isa = PBXGroup;
 			children = (
+				3492CC1E1C6DF0CC0057D8E8 /* mwm_traits.cpp */,
+				3492CC1F1C6DF0CC0057D8E8 /* mwm_traits.hpp */,
+				3492CC201C6DF0CC0057D8E8 /* file_logging.cpp */,
+				3492CC211C6DF0CC0057D8E8 /* file_logging.hpp */,
 				670E8C901BB31A2F00094197 /* ios_video_timer.mm */,
 				67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */,
 				67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */,
@@ -361,6 +373,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				675343B71A3F5D5A00A0A8C3 /* http_request.hpp in Headers */,
+				3492CC231C6DF0CC0057D8E8 /* mwm_traits.hpp in Headers */,
 				6741250B1B4C00CC00A3E828 /* country_file.hpp in Headers */,
 				675343B81A3F5D5A00A0A8C3 /* http_thread_apple.h in Headers */,
 				675343C21A3F5D5A00A0A8C3 /* location.hpp in Headers */,
@@ -378,6 +391,7 @@
 				675343D81A3F5D5A00A0A8C3 /* video_timer.hpp in Headers */,
 				6741250F1B4C00CC00A3E828 /* local_country_file.hpp in Headers */,
 				675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */,
+				3492CC251C6DF0CC0057D8E8 /* file_logging.hpp in Headers */,
 				6741250D1B4C00CC00A3E828 /* local_country_file_utils.hpp in Headers */,
 				675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */,
 				671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */,
@@ -510,6 +524,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3492CC221C6DF0CC0057D8E8 /* mwm_traits.cpp in Sources */,
 				675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */,
 				675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */,
 				67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */,
@@ -526,6 +541,7 @@
 				675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */,
 				675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */,
 				675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */,
+				3492CC241C6DF0CC0057D8E8 /* file_logging.cpp in Sources */,
 				675343D01A3F5D5A00A0A8C3 /* pthread_video_timer.cpp in Sources */,
 				675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */,
 				675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */,
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index 2a82a34344..b66aeeb33e 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -15,8 +15,6 @@
 		347F331B1C4540A8009758CC /* interval_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33001C4540A8009758CC /* interval_set.hpp */; };
 		347F331C1C4540A8009758CC /* locality.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33011C4540A8009758CC /* locality.cpp */; };
 		347F331D1C4540A8009758CC /* locality.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33021C4540A8009758CC /* locality.hpp */; };
-		347F331E1C4540A8009758CC /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33031C4540A8009758CC /* mwm_traits.cpp */; };
-		347F331F1C4540A8009758CC /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33041C4540A8009758CC /* mwm_traits.hpp */; };
 		347F33201C4540A8009758CC /* projection_on_street.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33051C4540A8009758CC /* projection_on_street.cpp */; };
 		347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33061C4540A8009758CC /* projection_on_street.hpp */; };
 		347F33221C4540A8009758CC /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33071C4540A8009758CC /* region.cpp */; };
@@ -58,6 +56,9 @@
 		347F336B1C45413C009758CC /* search_query_v2.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33531C45413C009758CC /* search_query_v2.hpp */; };
 		347F336C1C45413C009758CC /* street_vicinity_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33541C45413C009758CC /* street_vicinity_loader.cpp */; };
 		347F336D1C45413C009758CC /* street_vicinity_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33551C45413C009758CC /* street_vicinity_loader.hpp */; };
+		3492CC1B1C6DF0830057D8E8 /* locality_scorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC181C6DF0830057D8E8 /* locality_scorer.cpp */; };
+		3492CC1C1C6DF0830057D8E8 /* locality_scorer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC191C6DF0830057D8E8 /* locality_scorer.hpp */; };
+		3492CC1D1C6DF0830057D8E8 /* stats_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC1A1C6DF0830057D8E8 /* stats_cache.hpp */; };
 		34E44E701C4922E40057A5C4 /* intersection_result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */; };
 		34E44E711C4922E40057A5C4 /* intersection_result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */; };
 		34E44E741C4923100057A5C4 /* cbv_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34E44E721C4923100057A5C4 /* cbv_ptr.cpp */; };
@@ -140,8 +141,6 @@
 		347F33001C4540A8009758CC /* interval_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_set.hpp; sourceTree = "<group>"; };
 		347F33011C4540A8009758CC /* locality.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality.cpp; sourceTree = "<group>"; };
 		347F33021C4540A8009758CC /* locality.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality.hpp; sourceTree = "<group>"; };
-		347F33031C4540A8009758CC /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
-		347F33041C4540A8009758CC /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
 		347F33051C4540A8009758CC /* projection_on_street.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projection_on_street.cpp; sourceTree = "<group>"; };
 		347F33061C4540A8009758CC /* projection_on_street.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = projection_on_street.hpp; sourceTree = "<group>"; };
 		347F33071C4540A8009758CC /* region.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = region.cpp; sourceTree = "<group>"; };
@@ -183,6 +182,9 @@
 		347F33531C45413C009758CC /* search_query_v2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_v2.hpp; sourceTree = "<group>"; };
 		347F33541C45413C009758CC /* street_vicinity_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_vicinity_loader.cpp; sourceTree = "<group>"; };
 		347F33551C45413C009758CC /* street_vicinity_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = street_vicinity_loader.hpp; sourceTree = "<group>"; };
+		3492CC181C6DF0830057D8E8 /* locality_scorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_scorer.cpp; sourceTree = "<group>"; };
+		3492CC191C6DF0830057D8E8 /* locality_scorer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_scorer.hpp; sourceTree = "<group>"; };
+		3492CC1A1C6DF0830057D8E8 /* stats_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats_cache.hpp; sourceTree = "<group>"; };
 		34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intersection_result.cpp; sourceTree = "<group>"; };
 		34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = intersection_result.hpp; sourceTree = "<group>"; };
 		34E44E721C4923100057A5C4 /* cbv_ptr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cbv_ptr.cpp; sourceTree = "<group>"; };
@@ -279,6 +281,9 @@
 		347F333D1C45413C009758CC /* v2 */ = {
 			isa = PBXGroup;
 			children = (
+				3492CC181C6DF0830057D8E8 /* locality_scorer.cpp */,
+				3492CC191C6DF0830057D8E8 /* locality_scorer.hpp */,
+				3492CC1A1C6DF0830057D8E8 /* stats_cache.hpp */,
 				34E44E721C4923100057A5C4 /* cbv_ptr.cpp */,
 				34E44E731C4923100057A5C4 /* cbv_ptr.hpp */,
 				34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */,
@@ -379,8 +384,6 @@
 				347F33001C4540A8009758CC /* interval_set.hpp */,
 				347F33011C4540A8009758CC /* locality.cpp */,
 				347F33021C4540A8009758CC /* locality.hpp */,
-				347F33031C4540A8009758CC /* mwm_traits.cpp */,
-				347F33041C4540A8009758CC /* mwm_traits.hpp */,
 				347F33051C4540A8009758CC /* projection_on_street.cpp */,
 				347F33061C4540A8009758CC /* projection_on_street.hpp */,
 				347F33071C4540A8009758CC /* region.cpp */,
@@ -467,6 +470,7 @@
 				347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */,
 				347F33291C4540A8009758CC /* search_delimiters.hpp in Headers */,
 				675346DE1A40560D00A0A8C3 /* approximate_string_match.hpp in Headers */,
+				3492CC1C1C6DF0830057D8E8 /* locality_scorer.hpp in Headers */,
 				675346F31A40560D00A0A8C3 /* search_common.hpp in Headers */,
 				675346EE1A40560D00A0A8C3 /* locality_finder.hpp in Headers */,
 				675346EC1A40560D00A0A8C3 /* latlon_match.hpp in Headers */,
@@ -478,7 +482,6 @@
 				347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */,
 				347F331B1C4540A8009758CC /* interval_set.hpp in Headers */,
 				670EE5651B600255001E8064 /* search_query_params.hpp in Headers */,
-				347F331F1C4540A8009758CC /* mwm_traits.hpp in Headers */,
 				347F332E1C4540A8009758CC /* search_string_utils.hpp in Headers */,
 				675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */,
 				347F33181C4540A8009758CC /* categories_holder.hpp in Headers */,
@@ -492,6 +495,7 @@
 				675346DC1A40560D00A0A8C3 /* algos.hpp in Headers */,
 				675346E81A40560D00A0A8C3 /* keyword_lang_matcher.hpp in Headers */,
 				347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */,
+				3492CC1D1C6DF0830057D8E8 /* stats_cache.hpp in Headers */,
 				675346F21A40560D00A0A8C3 /* result.hpp in Headers */,
 				347F33251C4540A8009758CC /* retrieval.hpp in Headers */,
 			);
@@ -590,7 +594,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				347F331E1C4540A8009758CC /* mwm_traits.cpp in Sources */,
 				347F331C1C4540A8009758CC /* locality.cpp in Sources */,
 				675346DD1A40560D00A0A8C3 /* approximate_string_match.cpp in Sources */,
 				675346E51A40560D00A0A8C3 /* intermediate_result.cpp in Sources */,
@@ -609,6 +612,7 @@
 				347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */,
 				675346F11A40560D00A0A8C3 /* result.cpp in Sources */,
 				347F332D1C4540A8009758CC /* search_string_utils.cpp in Sources */,
+				3492CC1B1C6DF0830057D8E8 /* locality_scorer.cpp in Sources */,
 				347F33581C45413C009758CC /* features_layer.cpp in Sources */,
 				347F33221C4540A8009758CC /* region.cpp in Sources */,
 				347F33281C4540A8009758CC /* search_delimiters.cpp in Sources */,