diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
index 3691e03..c96b81f 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
@@ -18,13 +18,13 @@
                 </BarLink>
 			</BarItem>
             <BarItem>
-                <BarLink To="/" TextColor="TextColor.White">
+                <BarLink To="/admin" TextColor="TextColor.White">
                     <BarIcon Style="color:white" IconName="IconName.ShieldAlt" />
                     Admin
                 </BarLink>
             </BarItem>
             <BarItem>
-                <BarLink To="/" TextColor="TextColor.White">
+                <BarLink To="/addplug" TextColor="TextColor.White">
                     <BarIcon Style="color:white" IconName="IconName.Plug" />
                     Add Plug
                 </BarLink>
@@ -32,7 +32,7 @@
         </BarStart>
         <BarEnd>
             <BarItem>
-                <BarLink To="/" TextColor="TextColor.White">
+                <BarLink To="/settings" TextColor="TextColor.White">
                     <BarIcon Style="color:white" IconName="IconName.Wrench" />
                     Settings
                 </BarLink>
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
index 362810d..08efa17 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
@@ -10,7 +10,7 @@
 		</LayoutSiderContent>
 	</LayoutSider>
 	<Layout>
-		<LayoutContent Padding="Padding.Is4.OnX.Is4.FromTop">
+		<LayoutContent Padding="Padding.Is4.OnDesktop.Is0">
 			@Body
 		</LayoutContent>
 	</Layout>
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
new file mode 100644
index 0000000..91ba629
--- /dev/null
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
@@ -0,0 +1,43 @@
+@page "/addplug"
+@using Blazorise.Components;
+@using Elektrifikatsiya.Models;
+@inject IVersionProvider VersionProvider
+
+<Row Height=Height.Is50 Padding="Padding.Is3.OnDesktop.Is0">
+	<Column ColumnSize="ColumnSize.Is12" style="border-bottom-style:solid; border-bottom-color:#1a237e">
+		<ListView  Class="w-100"
+				  TItem="Device"
+				  Data="@plugs"
+				  TextField="@((_)=>(""))"
+				  ValueField="@((_)=>(""))"
+				  Mode="ListGroupMode.Static">
+			<ItemTemplate>
+				<ListGroupItem>
+					<Row>
+						<Column ColumnSize="ColumnSize.Is6">
+							<Row>
+								<Column >
+									<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
+								</Column>
+							</Row>
+							<Row Width="Width.Is100">
+								<Column>
+									<Small>IP: @context.Item.Address</Small>
+								</Column>
+							</Row>
+						</Column>
+						<Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
+							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+								<BarIcon IconName="IconName.Add" />
+							</Button>
+						</Column>
+					</Row>
+				</ListGroupItem>
+			</ItemTemplate>
+		</ListView>
+	</Column>
+</Row>
+
+@code {
+	List<Device> plugs = new List<Device>() { new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF") };
+}
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
index 3cd8102..de1ed5c 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
@@ -3,62 +3,64 @@
 @using Elektrifikatsiya.Models;
 @inject IVersionProvider VersionProvider
 
-<Row Padding="Padding.Is3">
-	<Column ColumnSize="ColumnSize.Is6">
-		<ListView TItem="Device"
-				  Data="@plugs"
-				  TextField="@((_)=>(""))"
-				  ValueField="@((_)=>(""))"
-				  Mode="ListGroupMode.Static">
-			<ItemTemplate>
-				<ListGroupItem>
-					<Row>
-						<Column ColumnSize="ColumnSize.Is8">
-							<Row>
-								<Column ColumnSize="ColumnSize.Is7">
-								<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
-								</Column>
-							</Row>
-							<Row>
-								<Column>
-									<Small>User: @context.Item.User</Small>
-									<br />
-									<Small>Room: @context.Item.Room</Small>
-								</Column>
-								<Column ColumnSize="ColumnSize.Is5">
-									<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
-								</Column>
-							</Row>
-						</Column>
-						<Column ColumnSize="ColumnSize.Is4">
-							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
-								<BarIcon IconName="IconName.Bolt" />
-							</Button>
-						</Column>
-					</Row>
-				</ListGroupItem>
-			</ItemTemplate>
-		</ListView>
-	</Column>
-	<Column ColumnSize="ColumnSize.Is6">
-		<ListView TItem="Event"
-				  Data="@events"
-				  TextField="@((_)=>(""))"
-				  ValueField="@((_)=>(""))"
-				  Mode="ListGroupMode.Static">
-			<ItemTemplate>
-				<Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100">
-					<Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading>
-					<Small>@context.Item.Date</Small>
-				</Div>
-				<Paragraph Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
-			</ItemTemplate>
-		</ListView>
-	</Column>
+<Row Padding="Padding.Is3.OnDesktop.Is0">
+	<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
+		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+			<ListView TItem="Device"
+					  Data="@plugs"
+					  TextField="@((_)=>(""))"
+					  ValueField="@((_)=>(""))"
+					  Mode="ListGroupMode.Static">
+				<ItemTemplate>
+					<ListGroupItem>
+						<Row>
+							<Column ColumnSize="ColumnSize.Is8">
+								<Row>
+									<Column ColumnSize="ColumnSize.Is7">
+										<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
+									</Column>
+								</Row>
+								<Row>
+									<Column>
+										<Small>User: @context.Item.User</Small>
+										<br />
+										<Small>Room: @context.Item.Room</Small>
+									</Column>
+									<Column ColumnSize="ColumnSize.Is5">
+										<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
+									</Column>
+								</Row>
+							</Column>
+							<Column ColumnSize="ColumnSize.Is4">
+								<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+									<BarIcon IconName="IconName.Bolt" />
+								</Button>
+							</Column>
+						</Row>
+					</ListGroupItem>
+				</ItemTemplate>
+			</ListView>
+		</Column>
+		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+			<ListView TItem="Event"
+					  Data="@events"
+					  TextField="@((_)=>(""))"
+					  ValueField="@((_)=>(""))"
+					  Mode="ListGroupMode.Static">
+				<ItemTemplate>
+					<Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100">
+						<Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading>
+						<Small>@context.Item.Date</Small>
+					</Div>
+					<Paragraph Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
+				</ItemTemplate>
+			</ListView>
+		</Column>
+	</Div>
 </Row>
 <Row Padding="Padding.Is3">
 	<Column>
-		<Button Color="Color.Primary" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
+		<Button Color="Color.Primary" Style="border-radius: 0px" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
 		<LineChart @ref="lineChart" TItem="double" />
 	</Column>
 </Row>
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite
new file mode 100644
index 0000000..eeeb96f
Binary files /dev/null and b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite differ
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm
new file mode 100644
index 0000000..fe9ac28
Binary files /dev/null and b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm differ
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal
new file mode 100644
index 0000000..e69de29
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png b/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png
index 88939cb..20091ee 100644
Binary files a/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png and b/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png differ