diff --git a/package.json b/package.json
index 41bdd8f..80fbb58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "puzzlez",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "private": true,
     "devDependencies": {
         "dateformat": "^3.0.3",
diff --git a/src/haxe/ru/m/puzzlez/PuzzlezApp.hx b/src/haxe/ru/m/puzzlez/PuzzlezApp.hx
index 9d55140..6067d9f 100644
--- a/src/haxe/ru/m/puzzlez/PuzzlezApp.hx
+++ b/src/haxe/ru/m/puzzlez/PuzzlezApp.hx
@@ -2,7 +2,6 @@ package ru.m.puzzlez;
 
 import haxework.App;
 import haxework.log.TraceLogger;
-import haxework.provider.Provider;
 import ru.m.puzzlez.storage.GameStorage;
 import ru.m.puzzlez.storage.ImageStorage;
 import ru.m.puzzlez.view.PuzzlezAppView;
@@ -11,9 +10,8 @@ class PuzzlezApp extends App {
 
     public static function main() {
         // ToDo: fix @:provide macro
-        Provider.instance.setFactory(ImageStorage, ImageStorage);
-        Provider.instance.setFactory(GameStorage, GameStorage);
-
+        GameStorage;
+        ImageStorage;
         L.push(new TraceLogger());
         var app = new PuzzlezApp(new PuzzlezTheme(), openfl.Assets.getBitmapData("resources/icon.png"));
         var view = new PuzzlezAppView();
diff --git a/src/haxe/ru/m/puzzlez/view/StartFrame.hx b/src/haxe/ru/m/puzzlez/view/StartFrame.hx
index a37dc75..13f8d7b 100644
--- a/src/haxe/ru/m/puzzlez/view/StartFrame.hx
+++ b/src/haxe/ru/m/puzzlez/view/StartFrame.hx
@@ -1,5 +1,6 @@
 package ru.m.puzzlez.view;
 
+import haxe.DynamicAccess;
 import haxework.view.data.DataView;
 import haxework.view.form.ButtonView;
 import haxework.view.frame.FrameSwitcher;
@@ -15,6 +16,8 @@ import ru.m.puzzlez.storage.ImageStorage;
     public static var ID = "start";
 
     @:view var sources:DataView<ImageListSource<Dynamic>, ButtonView>;
+    @:view("load") var loadButton:ButtonView;
+
     @:provide var storage:ImageStorage;
     @:provide var switcher:FrameSwitcher;
     @:provide var gameStorage:GameStorage;
@@ -30,6 +33,10 @@ import ru.m.puzzlez.storage.ImageStorage;
         sources.data = data;
     }
 
+    override public function onShow(data:Dynamic):Void {
+        loadButton.text = 'Load (${gameStorage.list().length})';
+    }
+
     private function sourceViewFactory(index:Int, source:ImageListSource<Dynamic>):ButtonView {
         var result = new ButtonView();
         result.text = Std.string(source.type != null ? source.type : "custom");
diff --git a/src/haxe/ru/m/puzzlez/view/StartFrame.yaml b/src/haxe/ru/m/puzzlez/view/StartFrame.yaml
index 3cf97fd..fce97f6 100644
--- a/src/haxe/ru/m/puzzlez/view/StartFrame.yaml
+++ b/src/haxe/ru/m/puzzlez/view/StartFrame.yaml
@@ -22,7 +22,8 @@ views:
     geometry.width: 100%
     layout.vAlign: middle
     views:
-      - $type: haxework.view.form.ButtonView
+      - id: load
+        $type: haxework.view.form.ButtonView
         text: Load
         +onPress: ~switcher.change('game_list')
       - $type: haxework.view.SpriteView