diff --git a/www/css/main.css b/www/css/main.css
index e69de29..9783685 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -0,0 +1,3 @@
+.item-hidden {
+    display: none;
+}
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 4b34362..5403a6a 100644
--- a/www/index.html
+++ b/www/index.html
@@ -16,6 +16,9 @@
 
         <!-- FontAwesome -->
         <link href="css/font-awesome.css" rel="stylesheet">
+        
+        <!-- Other styles -->
+        <link href="css/main.css" rel="stylesheet">
 
         <!-- jQuery Version 1.11.1 -->
         <script src="js/jquery.js"></script>
diff --git a/www/js/main.js b/www/js/main.js
index a54652b..1389dd9 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -7,7 +7,8 @@
 /**
  * API base URL
  */
-APIURL = "http://snipe-mobile-api/snipeapi/app/";
+APIURL = "";
+//APIURL = "http://snipe-mobile-api/snipeapi/app/";
 //APIURL = "http://localhost:8000/";
 username = "";
 
@@ -35,7 +36,16 @@ function dologin() {
     if ($('#usernameBox').val() === "") {
         $('#errormsg').text("Error:  Missing username.");
         $('#errorbase').css('display', 'block');
+        $('#loginBtn').html('<i class="fa fa-sign-in"></i> Login');
+        return;
     }
+    if ($('#urlBox').val() === "") {
+        $('#errormsg').text("Error:  Missing API address.");
+        $('#errorbase').css('display', 'block');
+        $('#loginBtn').html('<i class="fa fa-sign-in"></i> Login');
+        return;
+    }
+    APIURL = $('#urlBox').val();
     $.ajax({
         type: "POST",
         url: mkApiUrl("login"),
@@ -50,6 +60,7 @@ function dologin() {
             if (data.status === 'OK') {
                 username = $('#usernameBox').val();
                 localStorage.setItem("username", username);
+                localStorage.setItem("apiurl", APIURL);
                 openscreen("home");
             } else {
                 $('#loginBtn').html('<i class="fa fa-sign-in"></i> Login');
diff --git a/www/screens/home.html b/www/screens/home.html
index bf0f92a..234adc4 100644
--- a/www/screens/home.html
+++ b/www/screens/home.html
@@ -47,8 +47,8 @@
 
                     </select>
                 </div>
-                <br class="item-only-asset"/>
-                <div class="input-group item-only-asset">
+                <br class="item-only-asset item-hidden"/>
+                <div class="input-group item-only-asset item-hidden">
                     <span class="input-group-addon"><i class="fa fa-fw fa-hdd-o"></i></span>
                     <input type="text" class="form-control" id="item-hdd-secure" placeholder="Hard Drive Secure (Y/N)" />
                 </div>
@@ -105,7 +105,7 @@
                     <li><a href="#" onclick="additem('asset');" id="addassetbtn"><i class="fa fa-fw fa-desktop"></i> Asset</a></li>
                     <li><a href="#" onclick="additem('accessory');" id="addaccessorybtn"><i class="fa fa-fw fa-keyboard-o"></i> Accessory</a></li>
                     <li><a href="#" onclick="additem('consumable');" id="addconsumablebtn"><i class="fa fa-fw fa-tint"></i> Consumable</a></li>
-                    <li><a href="#" onclick="additem('hdd');" id="addassetbtn"><i class="fa fa-fw fa-hdd-o"></i> Hard Drive</a></li>
+                    <li class="item-hidden"><a href="#" onclick="additem('hdd');" id="addassetbtn"><i class="fa fa-fw fa-hdd-o"></i> Hard Drive</a></li>
                 </ul>
             </div>
         </div>
diff --git a/www/screens/login.html b/www/screens/login.html
index f61fdb6..5ac6874 100644
--- a/www/screens/login.html
+++ b/www/screens/login.html
@@ -10,6 +10,12 @@
                     <div id="errorbase" class="alert alert-danger alert-dismissable" style="display: none;">
                         <p id="errormsg">An error occurred.</p>
                     </div>
+                    <br />
+                    <div class="input-group">
+                        <span class="input-group-addon" id="basic-addon-globeicon"><i class="fa fa-globe"></i></span>
+                        <input type="text" placeholder="API Address" id="urlBox" class="form-control" aria-describedby="basic-addon-globeicon" value="" />
+                    </div>
+                    <br />
                     <div class="input-group">
                         <span class="input-group-addon" id="basic-addon-usericon"><i class="fa fa-user"></i></span>
                         <input type="text" placeholder="Username" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/>
@@ -32,6 +38,11 @@
     } else {
         $('#usernameBox').val(localStorage.getItem("username"));
     }
+    
+    if (localStorage.getItem("apiurl") === null) {
+    } else {
+        $('#urlBox').val(localStorage.getItem("apiurl"));
+    }
 
     $("#usernameBox").keydown(function (event) {
         if (event.keyCode == 13) {