diff --git a/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java b/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java
index 89cbfa4..d421e78 100644
--- a/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java
+++ b/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java
@@ -40,6 +40,11 @@ public BoardInfoView() {
         setSizeFull();
         setJustifyContentMode(JustifyContentMode.START);
 
+        add(new Paragraph(
+                new Span("Information about all the Raspberry Pi boards. This info is based on the "),
+                new Anchor("https://pi4j.com/documentation/board-info", "board info", AnchorTarget.BLANK),
+                new Span(" provided by the Pi4J library.")));
+
         listBox.addValueChangeListener(e -> showBoard(e.getValue()));
         listBox.setMinWidth(300, Unit.PIXELS);
         listBox.setHeightFull();
diff --git a/src/main/java/com/pi4j/boardinfoservice/views/SystemInfoView.java b/src/main/java/com/pi4j/boardinfoservice/views/SystemInfoView.java
index eddc902..0dd94d3 100644
--- a/src/main/java/com/pi4j/boardinfoservice/views/SystemInfoView.java
+++ b/src/main/java/com/pi4j/boardinfoservice/views/SystemInfoView.java
@@ -5,6 +5,10 @@
 import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.grid.ColumnTextAlign;
 import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.AnchorTarget;
+import com.vaadin.flow.component.html.Paragraph;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
@@ -25,6 +29,11 @@ public SystemInfoView(@Autowired SystemInfoService systemInfoService) {
 
         setSpacing(false);
 
+        add(new Paragraph(
+                new Span("Information about the Raspberry Pi board that runs this webservice. This info is returned by the "),
+                new Anchor("https://github.com/Pi4J/pi4j-v2/blob/develop/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java", "BoardInfoHelper", AnchorTarget.BLANK),
+                new Span(", which is available in the Pi4J Core library.")));
+
         Grid<InfoLine> grid = new Grid<>(InfoLine.class, false);
         grid.addColumn(InfoLine::type)
                 .setHeader("Type")
@@ -44,8 +53,8 @@ public SystemInfoView(@Autowired SystemInfoService systemInfoService) {
         add(grid);
 
         setSizeFull();
-        setJustifyContentMode(JustifyContentMode.CENTER);
-        setDefaultHorizontalComponentAlignment(Alignment.CENTER);
+        //setJustifyContentMode(JustifyContentMode.LEF);
+        //setDefaultHorizontalComponentAlignment(Alignment.CENTER);
         getStyle().set("text-align", "center");
     }