diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite
index 81dae89..b7a73e2 100644
Binary files a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite and b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite differ
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm
index 69987d0..fe9ac28 100644
Binary files a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm and b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm differ
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal
index f6e298c..e69de29 100644
Binary files a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal and b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal differ
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
index fa1eff0..b58022e 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
@@ -2,124 +2,134 @@
 @using Blazorise.Components;
 @using Elektrifikatsiya.Models;
 @using System.Net
-<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.Is5">
+<Div>
+	<Row Style="width: 100%; height: 100%">
+		<Div Display="Display.Flex.Row.OnDesktop" Margin=" Margin.Is3.FromBottom" Width="Width.Is100">
+		<Column ColumnSize="ColumnSize.Is5.OnDesktop.Is12.OnMobile">
+			<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.Is6">
+								<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>
+								</Row>
+							</Column>
+
+							<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is7.OnMobile">
+								<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+									<BarIcon IconName="IconName.Bolt" />
+								</Button>
+							</Column>
+								<br />
+								<br />
 							<Row>
-								<Column ColumnSize="ColumnSize.Is7">
-									<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
-								</Column>
+									<Column ColumnSize="ColumnSize.Is1.OnDesktop">
+										<Button Position="Position.Absolute.Top.Is50.Start.Is100.Translate.Middle" Color="Color.Dark" Outline>
+											<BarIcon IconName="IconName.Pen" />
+										</Button>
+									</Column>
 							</Row>
-							<Row>
-								<Column>
-									<Small>User: @context.Item.User</Small>
-									<br />
-									<Small>Room: @context.Item.Room</Small>
-								</Column>
-							</Row>
-						</Column>
-						<Column ColumnSize="ColumnSize.Is2">
-							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
-								<BarIcon IconName="IconName.Bolt" />
-							</Button>
-						</Column>
-						<Column ColumnSize="ColumnSize.Is5">
-							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
-								<BarIcon IconName="IconName.Pen" />
-							</Button>
-						</Column>
-					</Row>
-				</ListGroupItem>
-			</ItemTemplate>
-		</ListView>
-	</Column>
-	<Column ColumnSize="ColumnSize.Is6">
-		<Field>
-			<FieldLabel>
-				<h5>
-					Plug Name
-				</h5>
-				<Paragraph>
-					Here you can change the Name of your Plug
-				</Paragraph>
-			</FieldLabel>
-			<TextEdit Placeholder="Enter Name" />
-		</Field>
-		<br />
-		<br />
-		<Field>
-			<FieldLabel>
-				<h5>
-					Change Max Output
-				</h5>
-				<Paragraph>
-					Here you can limit how much Power your Plug uses
-				</Paragraph>
-			</FieldLabel>
-			<TextEdit Placeholder="Enter Max Output" />
-		</Field>
-		<br />
-		<br />
-		<Field>
-			<FieldLabel>
-				<h5>
-					Electricity Price
-				</h5>
-				<Paragraph>
-					Here you enter your electricity price. This is gonna calculate the overall Price of your System
-				</Paragraph>
-			</FieldLabel>
-			<TextEdit Placeholder="Enter Electricity Price" />
-		</Field>
-		<br />
-		<br />	
-		<Field>
-			<FieldLabel>
-				<h5>
-					Select Room
-				</h5>
-				<Paragraph>
-					Here you select or change the Room where you use your Plug.
-				</Paragraph>
-			</FieldLabel>
+	
+						</Row>
+					</ListGroupItem>
+				</ItemTemplate>
+			</ListView>
+		</Column>
+		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile" Margin="Margin.Is3.OnMobile">
+			<Field>
+				<FieldLabel>
+					<h5>
+						Plug Name
+					</h5>
+					<Paragraph>
+						Here you can change the Name of your Plug
+					</Paragraph>
+				</FieldLabel>
+				<TextEdit Placeholder="Enter Name" />
+			</Field>
 			<br />
-			<Dropdown Display="Display.InlineBlock">
-				<DropdownToggle Color="Color.Primary" Width="Width.Is100">Rooms</DropdownToggle>
-				<DropdownMenu>
-					<DropdownItem>Room 1</DropdownItem>
-					<DropdownDivider />
-					<DropdownItem>Room 2</DropdownItem>
-					<DropdownDivider />
-					<DropdownItem>Room 3</DropdownItem>
-				</DropdownMenu>
-			</Dropdown>
-		</Field>
+			<br />
+			<Field>
+				<FieldLabel>
+					<h5>
+						Change Max Output
+					</h5>
+					<Paragraph>
+						Here you can limit how much Power your Plug uses
+					</Paragraph>
+				</FieldLabel>
+				<TextEdit Placeholder="Enter Max Output" />
+			</Field>
+			<br />
+			<br />
+			<Field>
+				<FieldLabel>
+					<h5>
+						Electricity Price
+					</h5>
+					<Paragraph>
+						Here you enter your electricity price. This is gonna calculate the overall Price of your System
+					</Paragraph>
+				</FieldLabel>
+				<TextEdit Placeholder="Enter Electricity Price" />
+			</Field>
+			<br />
+			<br />
+			<Field>
+				<FieldLabel>
+					<h5>
+						Select Room
+					</h5>
+					<Paragraph>
+						Here you select or change the Room where you use your Plug.
+					</Paragraph>
+				</FieldLabel>
+				<br />
+				<Dropdown Display="Display.InlineBlock">
+					<DropdownToggle Color="Color.Primary" Width="Width.Is100">Rooms</DropdownToggle>
+					<DropdownMenu>
+						<DropdownItem>Room 1</DropdownItem>
+						<DropdownDivider />
+						<DropdownItem>Room 2</DropdownItem>
+						<DropdownDivider />
+						<DropdownItem>Room 3</DropdownItem>
+					</DropdownMenu>
+				</Dropdown>
+			</Field>
 			<Column ColumnSize="ColumnSize.IsFull" TextAlignment="TextAlignment.End">
 				<Button Color="Color.Primary">Save</Button>
 			</Column>
 		</Column>
+		</Div>
+	</Row>
+</Div>
 
-</Row>
 
 
 @code {