diff --git a/config.xml b/config.xml
index ac78fed4..12624b3f 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.roxyboxxy.vrchub" version="1.1.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.roxyboxxy.vrchub" version="1.1.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>VRChat Mobile</name>
     <description>
         A sample Apache Cordova application that responds to the deviceready event.
@@ -7,6 +7,7 @@
     <author email="dev@cordova.apache.org" href="http://cordova.io">
         Apache Cordova Team
     </author>
+    <icon density="mdpi" height="57" platform="ios" src="res\icon\android\icon-96-xhdpi.png" width="57" />
     <content src="index.html" />
     <plugin name="cordova-plugin-whitelist" spec="1" />
     <access origin="*" />
@@ -19,6 +20,7 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
+    <plugin name="cordova-plugin-firebase" spec="^1.0.5" />
     <engine name="android" spec="^7.0.0" />
     <engine name="browser" spec="^5.0.4" />
 </widget>
diff --git a/www/main.js b/www/main.js
index 80822a7d..1505ca7f 100644
--- a/www/main.js
+++ b/www/main.js
@@ -106,22 +106,21 @@ function reqKey(success,error){
 function setUserdata(data){
 	localStorage["token"] = data["authToken"];
 	localStorage["user_icon_url"] = data["currentAvatarThumbnailImageUrl"];
-	localStorage["user_name"] = data["displayName"].length;
+	localStorage["api_username"] = data["displayName"];
 	localStorage["friends_num"] = data["friends"].length;
 	console.log(data);
 }
 function showInfo(data){
 	$("#userpanel").show();
-	console.log("xxxx showInfo");
+	console.log("Loading User Data");
 	var icon = localStorage["user_icon_url"];
-	var name = localStorage["user_name"];
+	var name = localStorage["user"];
 	var fr_num = localStorage["friends_num"];
-	console.log(name)
 
 	var $img = $("<img>").attr({src: icon,id:"myicon"});
-	var $name= $("<div>").text("N/A");
+	var $name = $("<div>").text("logged in as " + name);
 	var $onfr   = $("<div>").attr({id:"onfr" ,title:"onlinefriends"});
-	var $allfr  = $("<div>").attr({id:"allfr",title:"allfriends"}).text(" Friends");
+	var $allfr  = $("<div>").attr({id:"allfr",title:"allfriends"}).text(" / " + fr_num + " friends");
 	$("#userpanel").empty().append($img).append($name).append($onfr).append($allfr);
 
 
@@ -133,9 +132,10 @@ function reqToken(success,error){
 	var p = getPassword();
 	var k = getClientapikey();
 
-	sendReqCommand({user:u,pass:p,key:k,type:"basic"},"auth/user",(data)=>{
+	sendReqCommand({user:u,pass:p,key:k,type:"auth"},"auth/user",(data)=>{
 		setUserdata(data);
 		success(data);
+		console.log("connected")
 	},error);
 }
 function fetchOnlinedata(success){
@@ -175,7 +175,7 @@ function showfriends(data){
 				src:val["currentAvatarThumbnailImageUrl"],
 				align:"middle"
 			});
-			console.log("name ",val["displayName"]);
+			console.log("****name ",val["displayName"]);
 			var worldid = worldId(val["location"]);
 			var instanceid = instanceId(val["location"]);
 
@@ -190,7 +190,7 @@ function showfriends(data){
 			$("#friends").append($newli);
 
 	});
-}
+ }
 function preset_in(str){
 	return " in " + str;
 }
@@ -324,7 +324,7 @@ function login(){
 					//�ł��Ȃ�������token���Â��Ƃ������ƂȂ̂�reqtoken�ōX�V����
 					reqToken(
 						(data)=>{
-							//setUserdata(data);
+							//�擾�ɐ���������setUserdata���ĕ\��
 							loginsuccess(data);
 						},()=>{
 							//�擾�Ɏ��s�������\��error:���O�C���ł��܂����ł���
@@ -356,7 +356,6 @@ function logout(){
 	$("#loginpanel").show();
 	$("#friendspanel").hide();
 	$("#userpanel").hide();
-	$("#profile").hide();
 	loginstatusclear();
 	backgroundsend("logout");
 }
diff --git a/www/popup.css b/www/popup.css
index 89acaf94..6d4a2c92 100644
--- a/www/popup.css
+++ b/www/popup.css
@@ -34,14 +34,21 @@ float:left
 	list-style-type: none;
 
 
+
 }
 img {
     border-radius: 50%;
+    
 }
 
 .c_img{
 	float:left;
 	border-radius: 50%;
+	padding-right: 10%;
+	padding-top :5%;
+	padding-left: 5%;
+
+
 }
 ul li,ol li {
 list-style-position: none;
@@ -66,6 +73,7 @@ margin-top: 5px;
 }
 a{
 	color:#FFF;
+	padding-left: 27%;
 }
 a:hover{
 	color:#5555FF;
@@ -74,4 +82,8 @@ a:hover{
 #friends {
 	    position: relative;
     right: 26px;
+    padding-left: 27%;
+}
+#displayNamestyle{
+	    padding-left: 27%;
 }
\ No newline at end of file
diff --git a/www/popup.js b/www/popup.js
index 501a6804..fa300eb8 100644
--- a/www/popup.js
+++ b/www/popup.js
@@ -1,4 +1,3 @@
-
 $(document).ready(function(){
 
 	if(islogin()){
@@ -32,30 +31,6 @@ $(document).ready(function(){
 	});
 
 
-	$("#soundenable").prop("checked",JSON.parse(localStorage["sound"]));
-	$("#soundenable").click(()=>{
-		localStorage["sound"] = $("#soundenable").prop("checked");
-	});
-	$("#notificationenable").prop("checked",JSON.parse(localStorage["notification"]));
-	$("#notificationenable").click(()=>{
-		localStorage["notification"] = $("#notificationenable").prop("checked");
-		console.log(localStorage["notification"]);
-		if(isNotification()){
-			console.log("notification_on");
-			backgroundsend("notification_on");
-		}else{
-			console.log("notification_off");
-			backgroundsend("notification_off");
-		}
-	});
-
+	
 
-	$("#soundvolume").val(JSON.parse(localStorage["volume"]));
-	$("#soundvolume").on('input change',()=>{
-		localStorage["volume"] = $("#soundvolume").val();
 	});
-	$("#soundvolume").mouseup(()=>{
-		console.log("soundvolume chaneged");
-		backgroundsend("soundplay");
-	})
-});
diff --git a/www/profile.html b/www/profile.html
new file mode 100644
index 00000000..55b97482
--- /dev/null
+++ b/www/profile.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML>
+<!--
+	Forty by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+	<head>
+		<title>Forty by HTML5 UP</title>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+		<link rel="stylesheet" href="assets/css/main.css" />
+		<noscript><link rel="stylesheet" href="assets/css/noscript.css" /></noscript>
+		<script src="jquery-1.12.4.min.js"></script>
+		
+		<script src="popup.js"></script>
+		<link rel="stylesheet" type="text/css" href="popup.css">
+
+	</head>
+	<body class="is-preload">
+
+		<!-- Wrapper -->
+			<div id="wrapper">
+
+				<!-- Header -->
+					<header id="header" class="alt">
+						<a href="index.html" class="logo"><strong>VRChat Mobile</strong></a>
+						<nav>
+							<a href="#menu">Menu</a>
+						</nav>
+					</header>
+
+				<!-- Menu -->
+					<nav id="menu">
+						<ul class="actions stacked">
+							<li>
+								<li><a href="index.html" class="button fit">Freinds</a></li>
+								
+
+								<div id="loginpanel">
+									<div>
+										<div class="info">username:</div><input type="text" id="username" size="20"></input>
+									</div>
+									<div>
+										<div class="info">password:</div><input type="password" id="password" size="20"></input>
+									</div>
+									<div>
+										<button type="button" id="login">Login</button>
+									</div>
+									<hr />
+								</div>
+							</li>
+							<li><a id="logout" class="button fit">Logout</a></li>
+							<li><a href="#settings" class="button fit">Settings</a></li>
+							<li>
+								<a>Version 1.1B</a>
+							</li>
+						</ul>
+					</nav>
+					
+				<!-- Banner -->
+		
+
+				<!-- Main -->
+					
+
+<div id="userpanel">
+								</div>	
+	
+
+				<!-- Contact -->
+					
+
+				<!-- Footer -->
+				
+
+			</div>
+
+		<!-- Scripts -->
+			<script src="assets/js/jquery.min.js"></script>
+			<script src="assets/js/jquery.scrolly.min.js"></script>
+			<script src="assets/js/jquery.scrollex.min.js"></script>
+			<script src="assets/js/browser.min.js"></script>
+			<script src="assets/js/breakpoints.min.js"></script>
+			<script src="assets/js/util.js"></script>
+			<script src="assets/js/main.js"></script>
+			<script src="main.js"></script>
+			<script src="popup.js"></script>
+
+	</body>
+</html>
\ No newline at end of file