diff --git a/.gitignore b/.gitignore
index 492607686..eb8a3413d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .vscode/
-node_modules/
\ No newline at end of file
+node_modules/
+dist/
+release/
\ No newline at end of file
diff --git a/main.js b/main.js
index 76cde9e41..2110753c8 100644
--- a/main.js
+++ b/main.js
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var electron_1 = require("electron");
 var path = require("path");
 var url = require("url");
-var constants_1 = require("./src/app/core/constants");
 // Logging needs to be imported in main.ts also. Otherwise it just doesn't work anywhere else.
 // See post by megahertz: https://github.com/megahertz/electron-log/issues/60
 // "You need to import electron-log in the main process. Without it, electron-log doesn't works in a renderer process."
@@ -48,12 +47,9 @@ function createWindow() {
         // when you should delete the corresponding element.
         win = null;
     });
-    // 'ready-to-show' doesn't fire on Windows. See: https://github.com/electron/electron/issues/7779
-    // win.on('ready-to-show', function () {
-    // win.show();
-    // win.focus();
-    // });
-    win.webContents.on('dom-ready', function () {
+    // 'ready-to-show' doesn't fire on Windows in dev mode. In prod it seems to work. 
+    // See: https://github.com/electron/electron/issues/7779
+    win.on('ready-to-show', function () {
         win.show();
         win.focus();
     });
@@ -67,14 +63,14 @@ function createWindow() {
     });
 }
 try {
-    electron_log_1.default.info("+++ Starting " + constants_1.Constants.applicationName + " (" + constants_1.Constants.applicationVersion + ") +++");
+    electron_log_1.default.info("+++ Starting +++");
     // This method will be called when Electron has finished
     // initialization and is ready to create browser windows.
     // Some APIs can only be used after this event occurs.
     electron_1.app.on('ready', createWindow);
     // Quit when all windows are closed.
     electron_1.app.on('window-all-closed', function () {
-        electron_log_1.default.info("+++ Stopping " + constants_1.Constants.applicationName + " (" + constants_1.Constants.applicationVersion + ") +++");
+        electron_log_1.default.info("+++ Stopping +++");
         // On OS X it is common for applications and their menu bar
         // to stay active until the user quits explicitly with Cmd + Q
         if (process.platform !== 'darwin') {
diff --git a/main.js.map b/main.js.map
index 4d7c16c1e..36d8f15a3 100644
--- a/main.js.map
+++ b/main.js.map
@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/main.ts b/main.ts
index 96f34757e..4467b0e6d 100644
--- a/main.ts
+++ b/main.ts
@@ -1,7 +1,6 @@
 import { app, BrowserWindow, screen } from 'electron';
 import * as path from 'path';
 import * as url from 'url';
-import { Constants } from './src/app/core/constants';
 
 // Logging needs to be imported in main.ts also. Otherwise it just doesn't work anywhere else.
 // See post by megahertz: https://github.com/megahertz/electron-log/issues/60
@@ -54,12 +53,9 @@ function createWindow() {
     win = null;
   });
 
-  // 'ready-to-show' doesn't fire on Windows. See: https://github.com/electron/electron/issues/7779
-  // win.on('ready-to-show', function () {
-    // win.show();
-    // win.focus();
-  // });
-  win.webContents.on('dom-ready', function () {
+  // 'ready-to-show' doesn't fire on Windows in dev mode. In prod it seems to work. 
+  // See: https://github.com/electron/electron/issues/7779
+  win.on('ready-to-show', function () {
     win.show();
     win.focus();
   });
@@ -75,7 +71,7 @@ function createWindow() {
 }
 
 try {
-  log.info(`+++ Starting ${Constants.applicationName} (${Constants.applicationVersion}) +++`);
+  log.info(`+++ Starting +++`);
 
   // This method will be called when Electron has finished
   // initialization and is ready to create browser windows.
@@ -84,7 +80,7 @@ try {
 
   // Quit when all windows are closed.
   app.on('window-all-closed', () => {
-    log.info(`+++ Stopping ${Constants.applicationName} (${Constants.applicationVersion}) +++`);
+    log.info(`+++ Stopping +++`);
     // On OS X it is common for applications and their menu bar
     // to stay active until the user quits explicitly with Cmd + Q
     if (process.platform !== 'darwin') {
diff --git a/src/app/components/main/main.component.ts b/src/app/components/main/main.component.ts
index 04c40f8bb..ae92bf8cf 100644
--- a/src/app/components/main/main.component.ts
+++ b/src/app/components/main/main.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { CollectionService } from '../../services/collection.service';
 import { Subscription } from "rxjs";
+import log from 'electron-log';
+import { Constants } from '../../core/constants';
 
 @Component({
     selector: 'main-page',
@@ -13,6 +15,7 @@ export class MainComponent implements OnInit {
     constructor(private collectionService: CollectionService) {
         this.subscription = collectionService.storageDirectoryInitialized$.subscribe((hasCollections) => this.hasCollections = hasCollections);
         this.hasCollections = collectionService.hasCollections;
+        log.info(`+++ Showing ${Constants.applicationName} (${Constants.applicationVersion}) main page +++`);
     }
 
     public hasCollections: boolean;
diff --git a/src/app/components/notes/notes.component.ts b/src/app/components/notes/notes.component.ts
index ad5fdc4d7..cfd28060a 100644
--- a/src/app/components/notes/notes.component.ts
+++ b/src/app/components/notes/notes.component.ts
@@ -10,7 +10,7 @@ import log from 'electron-log';
 })
 export class NotesComponent implements OnInit {
   constructor(private collectionService: CollectionService) {
-    log.info("Showing main screen");
+    log.info("Showing notes page");
   }
 
   public allNotesCount: number = 0;
diff --git a/src/app/components/welcome/welcome.component.ts b/src/app/components/welcome/welcome.component.ts
index ad1dea102..eb602ab7e 100644
--- a/src/app/components/welcome/welcome.component.ts
+++ b/src/app/components/welcome/welcome.component.ts
@@ -16,7 +16,7 @@ import { OperationResult } from '../../services/operationResult';
 export class WelcomeComponent implements OnInit {
 
     constructor(private translate: TranslateService, private collectionService: CollectionService, private dialog: MatDialog, private zone: NgZone) {
-        log.info("Showing welcome screen");
+        log.info("Showing welcome page");
     }
 
     public applicationName: string = Constants.applicationName.toUpperCase();
diff --git a/src/app/core/constants.ts b/src/app/core/constants.ts
index 2c068e7b8..c48b9caff 100644
--- a/src/app/core/constants.ts
+++ b/src/app/core/constants.ts
@@ -1,6 +1,6 @@
 export class Constants {
-    static readonly applicationName: string = "Knowte";
-    static readonly applicationVersion: any = require("../../../package.json").version;
+    static readonly applicationName: string = require("../../../package.json").name;
+    static readonly applicationVersion: string = require("../../../package.json").version;
     static readonly applicationCopyright: string = "Copyright Digimezzo Ⓒ 2013 - 2018";
     static readonly donateUrl = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MQALEWTEZ7HX8";
     static readonly websiteUrl = "https://www.digimezzo.com";