diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/App.razor b/src/Elektrifikatsiya/Elektrifikatsiya/App.razor
index 8286e30..a21c2fc 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/App.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/App.razor
@@ -26,7 +26,6 @@
                         ActiveColor = "#1a237e",
                         HoverColor = "#1a237e",
                     }
-
                 }
             },
             ColorOptions = new()
@@ -61,4 +60,4 @@
                 Primary = "#1a237e"
             }
         };
-}
\ No newline at end of file
+}
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor
new file mode 100644
index 0000000..4962196
--- /dev/null
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor
@@ -0,0 +1,18 @@
+@using System.Diagnostics;
+@inherits LayoutComponentBase
+<Image Source="logo.png" Width="Width.Is50" Height="Height.Is50"> </Image>
+<Card Width="Width.Is50" Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Padding="Padding.Is5">
+    <Field Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
+        <TextEdit Placeholder="Username" />
+    </Field>
+    <Field  Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
+        <TextEdit Role="TextRole.Password" Placeholder="Password" />
+    </Field>
+    <Button Width="Width.Is25"  Color="Color.Primary" Clicked="Clicked" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX" >Login</Button>
+</Card>
+@code {
+    private void Clicked()
+    {
+        Debug.WriteLine("Button was clicked!");
+    }
+}
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
index 08efa17..e268a9f 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
@@ -1,8 +1,6 @@
 @using Elektrifikatsiya.Components.Layout
 @inherits LayoutComponentBase
 
-
-
 <Layout Sider>
 	<LayoutSider>
 		<LayoutSiderContent>
@@ -14,4 +12,4 @@
 			@Body
 		</LayoutContent>
 	</Layout>
-</Layout>
\ No newline at end of file
+</Layout>
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
index 8f84fef..41cb0fb 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
@@ -9,9 +9,21 @@
 @inject IDeviceManagmentService DeviceManagmentService
 @inject IAuthenticationService AuthenticationService 
 
-<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"
+<Div >
+	<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
+		<Row Style="height:90%; width:100%">
+			<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
+			<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.RoundedTop">
+					<BarBrand>
+						Add a plug via wifi
+					</BarBrand>
+				</Bar>
+<ListView  Class="w-100"
 				  TItem="IPAddress"
 				  Data="@ipAddresses"
 				  TextField="@((_)=>(""))"
@@ -41,8 +53,42 @@
 				</ListGroupItem>
 			</ItemTemplate>
 		</ListView>
-	</Column>
-</Row>
+			</Column>
+		</Row>
+	</Row>
+	<Row Style="height:50%; width:100%; border-top-style:solid; border-top-color:#1a237e">
+		<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
+		<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
+			<Row Style="height:15%; width:100%"></Row>
+			<Row Style="height:10%; width:100%">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.RoundedTop"
+					 Style="width:100%">
+					<BarBrand>
+						Add a plug via IP
+					</BarBrand>
+				</Bar>
+				<ListGroup Style="width:100%; border-radius: 0px 0px">
+					<ListGroupItem Color="Color.Default">
+						<Form>
+							<Field Horizontal>
+								<FieldBody ColumnSize="ColumnSize.Is12">
+									<TextEdit Placeholder="Enter the Device IP here" />
+									<br>
+									<Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" PreventDefaultOnSubmit>CONNECT</Button>
+								</FieldBody>
+							</Field>
+						</Form>
+					</ListGroupItem>
+				</ListGroup>
+			</Row>
+			<Row Style="height:75%; width:100%"></Row>
+		</Column>
+	</Row>
+</Div>
 
 @code {
 	List<IPAddress> ipAddresses = new List<IPAddress>();
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
index b905ed3..049c64e 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
@@ -4,16 +4,26 @@
 @using System.Net
 @inject IVersionProvider VersionProvider
 
-<Row Padding="Padding.Is3.OnDesktop.Is0">
+<Row Padding="Padding.Is3">
 	<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
 		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+			<Bar Breakpoint="Breakpoint.Desktop"
+				 Background="Background.White"
+				 ThemeContrast="ThemeContrast.None"
+				 Shadow="Shadow.Remove"
+				 Border="Border.Is1.RoundedTop">
+				<BarBrand>
+					Plugs
+				</BarBrand>
+			</Bar>
 			<ListView TItem="Device"
 					  Data="@plugs"
 					  TextField="@((_)=>(""))"
 					  ValueField="@((_)=>(""))"
-					  Mode="ListGroupMode.Static">
+					  Mode="ListGroupMode.Static"
+					  Style="border-radius: 0px 0px">
 				<ItemTemplate>
-					<ListGroupItem>
+					<ListGroupItem Border="Border.OnBottom">
 						<Row>
 							<Column ColumnSize="ColumnSize.Is8">
 								<Row>
@@ -42,18 +52,29 @@
 				</ItemTemplate>
 			</ListView>
 		</Column>
-		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+		<Column ColumnSize="ColumnSize.Is6">
+			<Bar Breakpoint="Breakpoint.Desktop"
+				 Background="Background.White"
+				 ThemeContrast="ThemeContrast.None"
+				 Shadow="Shadow.Remove"
+				 Border="Border.Is1.Rounded.RoundedTop">
+				<BarBrand>
+					Plugs
+				</BarBrand>
+			</Bar>
 			<ListView TItem="Event"
 					  Data="@events"
 					  TextField="@((_)=>(""))"
 					  ValueField="@((_)=>(""))"
-					  Mode="ListGroupMode.Static">
+					  Mode="ListGroupMode.Static"
+					  Style="border-radius: 0px 0px">
+
 				<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>
+					<Paragraph Border="Border.OnBottom" Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
 				</ItemTemplate>
 			</ListView>
 		</Column>
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Login.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Login.razor
new file mode 100644
index 0000000..5c303a0
--- /dev/null
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Login.razor
@@ -0,0 +1,4 @@
+@using System.Diagnostics;
+@using Elektrifikatsiya.Layouts;
+@page "/login"
+@layout LoginLayout;
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
new file mode 100644
index 0000000..415044c
--- /dev/null
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
@@ -0,0 +1,61 @@
+@page "/Settings"
+@using Blazorise.Components;
+@using Elektrifikatsiya.Models;
+<Row Style="width: 100%; height: 100%">
+	<Column ColumnSize="ColumnSize.Is4">
+		<Bar Breakpoint="Breakpoint.Desktop"
+			 Background="Background.White"
+			 ThemeContrast="ThemeContrast.None"
+			 Shadow="Shadow.Remove"
+			 Border="Border.Is1.RoundedTop">
+			<BarBrand>
+				Plugs
+			</BarBrand>
+		</Bar>
+		<ListView TItem="Device"
+				  Data="@plugs"
+				  TextField="@((_)=>(""))"
+				  ValueField="@((_)=>(""))"
+				  
+				  Style="border-radius: 0px 0px"
+				  Height="100%" 
+				  MaxHeight="90%">
+			<ItemTemplate>
+				<ListGroupItem Border="Border.OnBottom">
+					<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>
+</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/wwwroot/Pictures/logo.png b/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/Pictures/logo.png
new file mode 100644
index 0000000..1904fe3
Binary files /dev/null and b/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/Pictures/logo.png differ
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png b/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png
index 20091ee..413ea80 100644
Binary files a/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png and b/src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png differ