diff --git a/.travis.yml b/.travis.yml
index f95d797..a042c1e 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,11 +13,11 @@ before_install:
 - electron-packager app/ --platform=win32 --arch=x64
 - electron-packager app/ --platform=win32 --arch=ia32
 - ls
-- tar -zcvf fontman-gui-linux-x64.tar.gz fontman-gui-linux-x64
-- tar -zcvf fontman-gui-linux-ia32.tar.gz fontman-gui-linux-ia32
-- tar -zcvf fontman-gui-darwin-x64.tar.gz fontman-gui-darwin-x64
-- zip -r fontman-gui-win32-ia32.zip fontman-gui-win32-ia32
-- zip -r fontman-gui-win32-x64.zip fontman-gui-win32-x64
+- tar -zcvf fontman-desktop-linux-x64.tar.gz fontman-desktop-linux-x64
+- tar -zcvf fontman-desktop-linux-ia32.tar.gz fontman-desktop-linux-ia32
+- tar -zcvf fontman-desktop-darwin-x64.tar.gz fontman-desktop-darwin-x64
+- zip -r fontman-desktop-win32-ia32.zip fontman-desktop-win32-ia32
+- zip -r fontman-desktop-win32-x64.zip fontman-desktop-win32-x64
 - ls
 script: echo "done"
 deploy:
@@ -25,15 +25,15 @@ deploy:
   provider: releases
   skip_cleanup: true
   file:
-  - fontman-gui-darwin-x64.tar.gz
-  - fontman-gui-linux-x64.tar.gz
-  - fontman-gui-linux-ia32.tar.gz
-  - fontman-gui-win32-ia32.zip
-  - fontman-gui-win32-x64.zip
+  - fontman-desktop-darwin-x64.tar.gz
+  - fontman-desktop-linux-x64.tar.gz
+  - fontman-desktop-linux-ia32.tar.gz
+  - fontman-desktop-win32-ia32.zip
+  - fontman-desktop-win32-x64.zip
   on:
     tags: true
     all_branches: true
-    repo: fontman/fontman-gui
+    repo: fontman/fontman-desktop
   api-key:
     secure: N9IU2xYJQBMuf9Ay828WCGs/zZJgRwcd+MeDjFt0AySqv5FTo4JxEL8DgG0URxj9Gd+GRttNHVEL7ajPdPq9Hnm7+lkr5wP8A8DDtu5Ir3JPtN2TWkBX27QDJsU74ZyuTslgTsu7sI4dRI47p0r/TLWdpRuFEnkKIwaXuTawpSDWF1wxr4BlzXZrP6GdUEK6cFMESbcMeA+d6CjZt824XHLQT8HCBfMrz8fK+LfQerm0pxdQF8sFFhqzRS2r5yzDSg0YMdmwCE5d10F/TG/tutbSkD37MZaghDTPYzlpe+rwkf5A6Tvr1ETR0TXicqQzNet2xg4Ilm38QvAn3vHQwmUd+LlfZ4B/lNkbEf1amnp6IPzisWzEP4DrvAY2AOYxxD/3Np4sV372JOzK+TiKwLAnOMUb9AECJzS2AR2ezIH6RwPjyihmVdR7EyyUP/Xz2HzaH3thKLdlkVLxvqUifK/ElFycFUnAOCbOu3mn834bgkdgL28tnzOuUCXCTCJITbwqBjcjkKUZvRUqZGtfkMJo6DEfeOGwyOAREXwDX9bHdjQyYih9JhgX5g5fZyq44GVlAvD9KFqX3VdOeVNAT9qqb1lFQVwHlwCjQVgUv3mCN+pFEG3BNmb757sAI0Rfc1ohYsqWLqa8t0raG9Tk3evFuljmE7orlFlMGlHkHuI=
 env:
diff --git a/app/css/custom.css b/app/css/custom.css
index ce4e72e..0a5bc1a 100755
--- a/app/css/custom.css
+++ b/app/css/custom.css
@@ -292,6 +292,11 @@ span.offcurve { color: orangered; }
     padding-top: 150px;
 }
 
+.sign-up {
+    background-color: white;
+    padding: 10px 10px 10px 10px;
+}
+
 .slider-label {
     font-size: 12px;
 }
diff --git a/app/fontman.js b/app/fontman.js
index 7f52c56..0dc2879 100755
--- a/app/fontman.js
+++ b/app/fontman.js
@@ -51,20 +51,6 @@ fontmanApp
         $scope.inProgress = false;
         $scope.selectedNavIndex = 0;
 
-        // profile creation dialog
-        $scope.createProfileDialog = function (ev) {
-            $mdDialog.show({
-                controller: profileCreationController,
-                templateUrl: "ng-modules/ng-templates/create_profile.html",
-                parent: angular.element(document.body),
-                targetEvent: ev,
-                clickOutsideToClose: true
-            })
-                .then(function () {
-                    setAuthStatus();  // refresh auth status
-                })
-        };
-
         // login dialog
         $scope.loginDialog = function (ev) {
             $mdDialog.show({
@@ -118,74 +104,61 @@ fontmanApp
                 password: undefined
             };
 
+            $scope.profileData = {
+                email: undefined,
+                name: undefined,
+                password: undefined
+            };
+            $scope.confirmPassword = undefined;
+
             $scope.cancel = function() {
                 $mdDialog.cancel();
             };
 
             $scope.clearFields = function () {
-                $scope.loginData.email = undefined;
-                $scope.loginData.password = undefined;
+                $scope.profileData.email = undefined;
+                $scope.profileData.name = undefined;
+                $scope.profileData.password = undefined;
+                $scope.confirmPassword = undefined;
             };
 
-            $scope.loginProfile = function () {
+            $scope.createProfile = function () {
                 $scope.inProgress = true;
 
-                $http.post("http://127.0.0.1:5000/auth/login", $scope.loginData)
+                $http.post("http://127.0.0.1:5000/auth/new/profile", $scope.profileData)
                     .then(function onSuccess(response) {
                         if(response.data === true) {
                             $scope.inProgress = false;
                             $mdDialog.hide();
                         } else {
-                            $scope.errorResponse = response.data;
                             $scope.inProgress = false;
+                            alert(response.data.error);
                         }
                     })
                     .catch(function onError() {
                         $scope.inProgress = false;
-                        alert("FMS connection failed!");
+                        alert("FMS connection failed!")
                     });
 
                 $scope.inProgress = false;
             };
-        };
-
-        // profile creation dialog controller
-        var profileCreationController = function ($http, $mdDialog, $mdToast, $scope) {
-            $scope.inProgress = false;
-            $scope.profileData = {
-                email: undefined,
-                name: undefined,
-                password: undefined
-            };
-            $scope.confirmPassword = undefined;
-
-            $scope.cancel = function() {
-                $mdDialog.cancel();
-            };
-            
-            $scope.clearFields = function () {
-                $scope.profileData.email = undefined;
-                $scope.profileData.name = undefined;
-                $scope.profileData.password = undefined;
-                $scope.confirmPassword = undefined;
-            };
 
-            $scope.createProfile = function () {
+            $scope.loginProfile = function () {
                 $scope.inProgress = true;
 
-                $http.post("http://127.0.0.1:5000/auth/new/profile", $scope.profileData)
+                $http.post("http://127.0.0.1:5000/auth/login", $scope.loginData)
                     .then(function onSuccess(response) {
                         if(response.data === true) {
                             $scope.inProgress = false;
                             $mdDialog.hide();
                         } else {
+                            $scope.errorResponse = response.data;
                             $scope.inProgress = false;
-                            alert(response.data.error);
                         }
                     })
                     .catch(function onError() {
                         $scope.inProgress = false;
-                        alert("FMS connection failed!")
+                        alert("FMS connection failed!");
                     });
 
                 $scope.inProgress = false;
@@ -209,7 +182,7 @@ fontmanApp
             if($scope.authStatus===true) {
                 $http.get("http://127.0.0.1:5000/auth/profile")
                     .then(function onSuccess(response) {
-                        $scope.fontmanUser = (response.data.name).toUpperCase();
+                        $scope.fontmanUser = (response.data.name);
                         $scope.fontmanUserId = response.data.user_id;
                     })
                     .catch(function onError(response) {
diff --git a/app/ng-modules/ng-templates/create_profile.html b/app/ng-modules/ng-templates/create_profile.html
deleted file mode 100755
index 70e4ca3..0000000
--- a/app/ng-modules/ng-templates/create_profile.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<md-dialog aria-label="createProfile" class="auth-dialog">
-
-<form name="createProfileForm" ng-cloak>
-
-    <md-toolbar>
-        <div class="md-toolbar-tools" >
-            <h2>Create New Profile</h2>
-            <span flex></span>
-
-            <md-button class="md-icon-button" ng-click="cancel()">
-                <md-icon aria-label="Close dialog" class="close-dialog-icon ">close</md-icon>
-            </md-button>
-        </div>
-    </md-toolbar>
-
-    <md-dialog-content>
-        <div class="md-dialog-content">
-
-            <md-input-container class="md-block" >
-                <label>Email</label>
-                <input required="" type="email" name="profileEmail" ng-model="profileData.email" minlength="10" maxlength="100" ng-pattern="/^.+@.+\..+$/">
-
-                <div ng-messages="createProfileForm.profileEmail.$error" role="alert">
-                    <div ng-message-exp="['required', 'minlength', 'maxlength', 'pattern']">
-                        Your email must be between 10 and 100 characters long and look like an e-mail address.
-                    </div>
-                </div>
-            </md-input-container>
-
-            <md-input-container class="md-block">
-                <label>Name</label>
-                <input required="" name="name" ng-model="profileData.name">
-                <div ng-messages="createProfileForm.name.$error">
-                    <div ng-message="required">This is required.</div>
-                </div>
-            </md-input-container>
-
-            <md-input-container class="md-block">
-                <label>Password</label>
-                <input required="" type="password" name="password" ng-model="profileData.password">
-                <div ng-messages="createProfileForm.password.$error">
-                    <div ng-message="required">This is required.</div>
-                </div>
-            </md-input-container>
-
-            <md-input-container class="md-block">
-                <label>Confirm Password</label>
-                <input required="" type="password" name="confirmPassword" ng-model="confirmPassword" ui-validate=" '$value==profileData.password' " ui-validate-watch=" 'profileData.password' ">
-                <div ng-messages="createProfileForm.confirmPassword.$error.validator">
-                    <div class="validator-message" ng-show="createProfileForm.confirmPassword.$error.validator">Passwords does not match.</div>
-                </div>
-            </md-input-container>
-
-        </div>
-    </md-dialog-content>
-
-    <md-dialog-actions layout="row">
-        <md-progress-circular ng-if="inProgress" class="md-accent" md-diameter="40"></md-progress-circular>
-        <span flex></span>
-        <md-button ng-click="clearFields()">
-            CLEAR
-        </md-button>
-        <md-button ng-click="createProfile()" ng-disabled="createProfileForm.$invalid">
-            CREATE
-        </md-button>
-    </md-dialog-actions>
-
-</form>
-
-</md-dialog>
diff --git a/app/ng-modules/ng-templates/login.html b/app/ng-modules/ng-templates/login.html
index eae6eba..547ef95 100755
--- a/app/ng-modules/ng-templates/login.html
+++ b/app/ng-modules/ng-templates/login.html
@@ -1,53 +1,133 @@
 <md-dialog aria-label="login" class="auth-dialog">
 
-    <form name="loginForm" ng-cloak>
-
-        <md-toolbar>
-            <div class="md-toolbar-tools" >
-                <h2>Login</h2>
-                <span flex></span>
-                <md-button class="md-icon-button" ng-click="cancel()">
-                    <md-icon aria-label="Close dialog" class="close-dialog-icon">close</md-icon>
-                </md-button>
-            </div>
-        </md-toolbar>
-
-        <md-dialog-content>
-            <div class="md-dialog-content">
-
-                <div class="error-response">{{errorResponse.error}}</div>
-
-                <md-input-container class="md-block" >
-                    <label>Email</label>
-                    <input required="" type="email" name="loginEmail" ng-model="loginData.email" minlength="10" maxlength="100" ng-pattern="/^.+@.+\..+$/">
-
-                    <div ng-messages="loginForm.loginEmail.$error" role="alert">
-                        <div ng-message-exp="['required', 'minlength', 'maxlength', 'pattern']">
-                            Your email must be between 10 and 100 characters long and look like an e-mail address.
-                        </div>
-                    </div>
-                </md-input-container>
-
-                <md-input-container class="md-block">
-                    <label>Password</label>
-                    <input required="" type="password" name="password" ng-model="loginData.password">
-                    <div ng-messages="loginForm.password.$error">
-                        <div ng-message="required">This is required.</div>
-                    </div>
-                </md-input-container>
-
-            </div>
-        </md-dialog-content>
-
-        <md-dialog-actions layout="row">
-            <md-progress-circular ng-if="inProgress" class="md-accent" md-diameter="40"></md-progress-circular>
+    <md-toolbar>
+        <div class="md-toolbar-tools" >
+            <h2>Login</h2>
             <span flex></span>
-            <md-button ng-click="clearFields()">
-                CLEAR
-            </md-button>
-            <md-button ng-click="loginProfile()" ng-disabled="loginForm.$invalid">
-                LOGIN
+            <md-button class="md-icon-button" ng-click="cancel()">
+                <md-icon aria-label="Close dialog" class="close-dialog-icon">close</md-icon>
             </md-button>
-        </md-dialog-actions>
-    </form>
+        </div>
+    </md-toolbar>
+
+    <md-content class="sign-up">
+
+        <md-tabs md-dynamic-height md-border-bottom>
+
+            <md-tab label="sign in">
+
+                    <form name="loginForm">
+
+                        <md-dialog-content>
+
+                            <div class="md-dialog-content">
+
+                                <div class="error-response">{{errorResponse.error}}</div>
+
+                                <md-input-container class="md-block" >
+                                    <label>Email</label>
+                                    <input required="" type="email" name="loginEmail" ng-model="loginData.email" minlength="10" maxlength="100" ng-pattern="/^.+@.+\..+$/">
+
+                                    <div ng-messages="loginForm.loginEmail.$error" role="alert">
+                                        <div ng-message-exp="['required', 'minlength', 'maxlength', 'pattern']">
+                                            Your email must be between 10 and 100 characters long and look like an e-mail address.
+                                        </div>
+                                    </div>
+                                </md-input-container>
+
+                                <md-input-container class="md-block">
+                                    <label>Password</label>
+                                    <input required="" type="password" name="password" ng-model="loginData.password">
+                                    <div ng-messages="loginForm.password.$error">
+                                        <div ng-message="required">This is required.</div>
+                                    </div>
+                                </md-input-container>
+
+                            </div>
+
+                        </md-dialog-content>
+
+                        <md-dialog-actions layout="row">
+                            <md-progress-circular ng-if="inProgress" class="md-accent" md-diameter="40"></md-progress-circular>
+                            <span flex></span>
+                            <md-button>
+                                FORGOT PASSWORD
+                            </md-button>
+                            <md-button ng-click="loginProfile()" ng-disabled="loginForm.$invalid">
+                                LOGIN
+                            </md-button>
+                        </md-dialog-actions>
+
+                    </form>
+
+            </md-tab>
+
+            <md-tab label="sign up">
+
+                <form name="createProfileForm">
+
+                    <md-dialog-content>
+
+                        <div class="md-dialog-content">
+
+                            <md-input-container class="md-block" >
+                                <label>Email</label>
+                                <input required="" type="email" name="profileEmail" ng-model="profileData.email" minlength="10" maxlength="100" ng-pattern="/^.+@.+\..+$/">
+
+                                <div ng-messages="createProfileForm.profileEmail.$error" role="alert">
+                                    <div ng-message-exp="['required', 'minlength', 'maxlength', 'pattern']">
+                                        Your email must be between 10 and 100 characters long and look like an e-mail address.
+                                    </div>
+                                </div>
+                            </md-input-container>
+
+                            <md-input-container class="md-block">
+                                <label>Name</label>
+                                <input required="" name="name" ng-model="profileData.name">
+                                <div ng-messages="createProfileForm.name.$error">
+                                    <div ng-message="required">This is required.</div>
+                                </div>
+                            </md-input-container>
+
+                            <md-input-container class="md-block">
+                                <label>Password</label>
+                                <input required="" type="password" name="password" ng-model="profileData.password">
+                                <div ng-messages="createProfileForm.password.$error">
+                                    <div ng-message="required">This is required.</div>
+                                </div>
+                            </md-input-container>
+
+                            <md-input-container class="md-block">
+                                <label>Confirm Password</label>
+                                <input required="" type="password" name="confirmPassword" ng-model="confirmPassword" ui-validate=" '$value==profileData.password' " ui-validate-watch=" 'profileData.password' ">
+                                <div ng-messages="createProfileForm.confirmPassword.$error.validator">
+                                    <div class="validator-message" ng-show="createProfileForm.confirmPassword.$error.validator">Passwords does not match.</div>
+                                </div>
+                            </md-input-container>
+
+                        </div>
+
+                    </md-dialog-content>
+
+                    <md-dialog-actions layout="row">
+                        <md-progress-circular ng-if="inProgress" class="md-accent" md-diameter="40"></md-progress-circular>
+                        <span flex></span>
+                        <md-button ng-click="clearFields()">
+                            CLEAR
+                        </md-button>
+                        <md-button ng-click="createProfile()" ng-disabled="createProfileForm.$invalid">
+                            SIGN UP
+                        </md-button>
+                    </md-dialog-actions>
+
+                </form>
+
+            </md-tab>
+
+            <md-tab></md-tab>
+
+        </md-tabs>
+
+    </md-content>
+
 </md-dialog>