diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
index 41cb0fb..f14522f 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
@@ -34,9 +34,6 @@
 					<Row>
 						<Column ColumnSize="ColumnSize.Is6">
 							<Row>
-								<Column >
-									<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item</Heading>
-								</Column>
 							</Row>
 							<Row Width="Width.Is100">
 								<Column>
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
index 3dc0ff8..81adb33 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
@@ -4,96 +4,77 @@
 @using System.Net
 @inject IVersionProvider VersionProvider
 
-<Div>
-	<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"
-						  Style="border-radius: 0px 0px">
-					<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">
-				<Bar Breakpoint="Breakpoint.Desktop"
-					 Background="Background.White"
-					 ThemeContrast="ThemeContrast.None"
-					 Shadow="Shadow.Remove"
-					 Border="Border.Is1.Rounded.RoundedTop">
-					<BarBrand>
-						Logs
-					</BarBrand>
-				</Bar>
-				<ListView TItem="Event"
-						  Data="@events"
-						  TextField="@((_)=>(""))"
-						  ValueField="@((_)=>(""))"
-						  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>
-					</ItemTemplate>
-				</ListView>
-			</Column>
-		</Div>
-	</Row>
-	<Row Padding="Padding.Is3">
-		<Column>
-			<Button Color="Color.Primary" Style="border-radius: 0px" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
-			<LineChart @ref="lineChart" TItem="double" />
+<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"
+					  Style="border-radius: 0px 0px">
+				<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.Name</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>
-</Div>
+		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+			<Bar Breakpoint="Breakpoint.Desktop"
+				 Background="Background.White"
+				 ThemeContrast="ThemeContrast.None"
+				 Shadow="Shadow.Remove"
+				 Border="Border.Is1.Rounded.RoundedTop">
+				<BarBrand>
+					Logs
+				</BarBrand>
+			</Bar>
+			<ListView TItem="Event"
+					  Data="@events"
+					  TextField="@((_)=>(""))"
+					  ValueField="@((_)=>(""))"
+					  Mode="ListGroupMode.Static"
+					  Style="border-radius: 0px 0px">
 
 
 @code {
 	//TODO: insert new event here if plug produces one
 	List<Event> events = new List<Event>() { new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now) };
 	//TODO: insert new Device here if user adds one
-	List<Device> plugs = new List<Device>() { new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), };
+	List<Device> plugs = new List<Device>() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), };
 	//code for graph
 	LineChart<double> lineChart;
 
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
index 00e3089..fa1eff0 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
@@ -1,6 +1,7 @@
 @page "/Settings"
 @using Blazorise.Components;
 @using Elektrifikatsiya.Models;
+@using System.Net
 <Row Style="width: 100%; height: 100%">
 	<Column ColumnSize="ColumnSize.Is4">
 		<Bar Breakpoint="Breakpoint.Desktop"
@@ -124,6 +125,6 @@
 @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") };
+	List<Device> plugs = new List<Device>() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), };
 
 }