diff --git a/rescueapp/lib/AfterOpeningAirways.dart b/rescueapp/lib/AfterOpeningAirways.dart
index c3e743c6308f924e3eb427e28853bf5c4ad5a1d6..ce8568b456d6c1e3e43231225c2a68cfb294d59b 100644
--- a/rescueapp/lib/AfterOpeningAirways.dart
+++ b/rescueapp/lib/AfterOpeningAirways.dart
@@ -1,121 +1,134 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-
 class AfterOpeningAirways extends StatefulWidget {
   AfterOpeningAirways({Key key, this.title}) : super(key: key);
   final String title;
 
   @override
   _AfterOpeningAirwaysState createState() => _AfterOpeningAirwaysState();
-
 }
-class _AfterOpeningAirwaysState extends State<AfterOpeningAirways> {
 
+class _AfterOpeningAirwaysState extends State<AfterOpeningAirways> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        appBar: AppBar(
-          title: Text('KatApp'),
-        ),
-        body: Padding(
-          padding: EdgeInsets.symmetric(horizontal:40,vertical: 10),
-          child: Column(
-            children: <Widget>[
+      appBar: AppBar(
+        title: Text('KatApp'),
+      ),
+      body: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 40, vertical: 10),
+        child: Column(
+          children: <Widget>[
             SizedBox(
-                  height: 40,
-                  child: Container(
-
-                    decoration: BoxDecoration(
-                        color: Colors.grey[500]
-                    ),
-                    alignment: Alignment.center,
-                    child:Text('Ist der Patient gehfähig?' ,  style: TextStyle(fontSize: 22, color: Colors.blue[900])),
-                  )
-              ),
-
-              SizedBox(
                 height: 40,
                 child: Container(
-                  decoration: BoxDecoration(
-                      color: Colors.grey[500]
-                ),
+                  decoration: BoxDecoration(color: Colors.grey[500]),
                   alignment: Alignment.center,
-                  child:Text('Nein', style: TextStyle(fontSize: 20, color: Colors.blue [900], backgroundColor: Colors.grey[500])),
+                  child: Text('Ist der Patient gehfähig?',
+                      style: TextStyle(fontSize: 22, color: Colors.blue[900])),
                 )),
-              SizedBox(
-                  height: 40,
-                  child: Container(
-                    decoration: BoxDecoration(
-                        color: Colors.grey[500]
-                    ),
-                    alignment: Alignment.center,
-                    child:Text('A:Spontanatmung vorhanden?', style: TextStyle(fontSize: 20, color: Colors.blue [900], backgroundColor: Colors.grey[500])),
-                  )),
-              SizedBox(
-                  height: 40,
-                  child: Container(
-                    decoration: BoxDecoration(
-                        color: Colors.grey[500]
+            SizedBox(
+                height: 40,
+                child: Container(
+                  decoration: BoxDecoration(color: Colors.grey[500]),
+                  alignment: Alignment.center,
+                  child: Text('Nein',
+                      style: TextStyle(
+                          fontSize: 20,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.grey[500])),
+                )),
+            SizedBox(
+                height: 40,
+                child: Container(
+                  decoration: BoxDecoration(color: Colors.grey[500]),
+                  alignment: Alignment.center,
+                  child: Text('A:Spontanatmung vorhanden?',
+                      style: TextStyle(
+                          fontSize: 20,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.grey[500])),
+                )),
+            SizedBox(
+                height: 40,
+                child: Container(
+                  decoration: BoxDecoration(color: Colors.grey[500]),
+                  alignment: Alignment.center,
+                  child: Text('Nein',
+                      style: TextStyle(
+                          fontSize: 20,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.grey[500])),
+                )),
+            SizedBox(
+              height: 100,
+            ),
+            SizedBox(
+                height: 50,
+                child: Container(
+                  alignment: Alignment.center,
+                  decoration: BoxDecoration(
+                    border: Border(
+                      left: BorderSide(color: Colors.red, width: 2),
+                      right: BorderSide(color: Colors.red, width: 2),
+                      top: BorderSide(color: Colors.red, width: 2),
                     ),
-                    alignment: Alignment.center,
-                    child:Text('Nein', style: TextStyle(fontSize: 20, color: Colors.blue [900], backgroundColor: Colors.grey[500])),
-                  )),
-              SizedBox(
-                height: 100,),
-
-              SizedBox(
+                  ),
+                  child: Text('Kategorie A',
+                      style: TextStyle(
+                          fontSize: 22,
+                          fontWeight: FontWeight.w700,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.white)),
+                )),
+            SizedBox(
                 height: 50,
-                 child: Container(
+                width: 500,
+                child: Container(
                   alignment: Alignment.center,
-                   decoration: BoxDecoration(
-                       border: Border(
-                         left: BorderSide(color: Colors.red, width: 2),
-                         right: BorderSide(color: Colors.red, width: 2),
-                         top: BorderSide(color: Colors.red, width: 2),
-
-                   ),),
-                  child:Text('Kategorie A', style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: Colors.blue[900], backgroundColor: Colors.white)),
-                 )),
-
-              SizedBox(
-                  height: 50,
-                  width: 500,
-                  child: Container(
-                    alignment: Alignment.center,
-                    decoration: BoxDecoration(
-                      border: Border(
-                        left: BorderSide(color: Colors.red, width: 2),
-                        right: BorderSide(color: Colors.red, width: 2),
-                        bottom: BorderSide(color: Colors.red, width: 2),
-
-                      ),),
-                    child:Text('Nach Öffnung der Atemwege?', style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: Colors.blue[900], backgroundColor: Colors.white)),
-                  )),
-          SizedBox(
-            height: 50,
-          ),
-              SizedBox(
-                  width: 200,
-                  height: 50,
-              child: Container(
-                   child:RaisedButton(child: new Text('Ja',
-                     style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                     color: Colors.blue[900])),
-                     color: Colors.blue,
-                     onPressed: () {
-                    }))),
-              SizedBox(
-                height: 10,
-              ),
-              SizedBox(
-                  width: 200,
-                  height: 50,
+                  decoration: BoxDecoration(
+                    border: Border(
+                      left: BorderSide(color: Colors.red, width: 2),
+                      right: BorderSide(color: Colors.red, width: 2),
+                      bottom: BorderSide(color: Colors.red, width: 2),
+                    ),
+                  ),
+                  child: Text('Nach Öffnung der Atemwege?',
+                      style: TextStyle(
+                          fontSize: 22,
+                          fontWeight: FontWeight.w700,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.white)),
+                )),
+            SizedBox(
+              height: 50,
+            ),
+            SizedBox(
+                width: 200,
+                height: 50,
                 child: Container(
-                    child:RaisedButton(child: new Text('Nein',
-                        style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                        color: Colors.blue[900])),
+                    child: RaisedButton(
+                        child: new Text('Ja',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.blue[900])),
+                        color: Colors.blue,
+                        onPressed: () {}))),
+            SizedBox(
+              height: 10,
+            ),
+            SizedBox(
+                width: 200,
+                height: 50,
+                child: Container(
+                    child: RaisedButton(
+                        child: new Text('Nein',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.blue[900])),
                         color: Colors.blue,
                         onPressed: () {
                           Navigator.push(
@@ -124,27 +137,26 @@ class _AfterOpeningAirwaysState extends State<AfterOpeningAirways> {
                                 builder: (context) => AfterOpeningAirways()),
                           );
                         }))),
-              SizedBox(
+            SizedBox(
+              height: 50,
+            ),
+            SizedBox(
+                width: 200,
                 height: 50,
-              ),
-              SizedBox(
-                  width: 200,
-                  height: 50,
                 child: Container(
-                  child:RaisedButton(
-                      child: new Text('Zurück',
-                      style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                      color: Colors.white)),
-                      color: Colors.blue[900],
-                      onPressed: () {
+                    child: RaisedButton(
+                        child: new Text('Zurück',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.white)),
+                        color: Colors.blue[900],
+                        onPressed: () {
                           Navigator.pop(context);
-                }))),
-    ],
-  ),
-  ),
-  );
-}
+                        }))),
+          ],
+        ),
+      ),
+    );
+  }
 }
-
-
-
diff --git a/rescueapp/lib/Ambulatory.dart b/rescueapp/lib/Ambulatory.dart
index 77a870538a21d53608899aa35ff53ce94dbf175e..60ad7fd154f1d9dc63b245665d60026dc7cad197 100644
--- a/rescueapp/lib/Ambulatory.dart
+++ b/rescueapp/lib/Ambulatory.dart
@@ -1,7 +1,5 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:rescueapp/AfterOpeningAirways.dart';
 import 'package:rescueapp/SpontaneousBreathingPresent.dart';
 
 class Ambulatory extends StatefulWidget {
@@ -11,8 +9,8 @@ class Ambulatory extends StatefulWidget {
   @override
   _AmbulatoryState createState() => _AmbulatoryState();
 }
-class _AmbulatoryState extends State<Ambulatory> {
 
+class _AmbulatoryState extends State<Ambulatory> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -20,13 +18,12 @@ class _AmbulatoryState extends State<Ambulatory> {
         title: Text('KatApp'),
       ),
       body: Padding(
-        padding: EdgeInsets.symmetric(horizontal:40,vertical: 10),
+        padding: EdgeInsets.symmetric(horizontal: 40, vertical: 10),
         child: Column(
-
           children: <Widget>[
-
             SizedBox(
-              height: 150,),
+              height: 150,
+            ),
             SizedBox(
                 height: 100,
                 child: Container(
@@ -37,10 +34,15 @@ class _AmbulatoryState extends State<Ambulatory> {
                       right: BorderSide(color: Colors.red, width: 2),
                       top: BorderSide(color: Colors.red, width: 2),
                       bottom: BorderSide(color: Colors.red, width: 2),
-                    ),),
-                  child:Text('Ist der Patient gehfähig?', style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: Colors.blue[900], backgroundColor: Colors.white)),
+                    ),
+                  ),
+                  child: Text('Ist der Patient gehfähig?',
+                      style: TextStyle(
+                          fontSize: 22,
+                          fontWeight: FontWeight.w700,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.white)),
                 )),
-
             SizedBox(
               height: 100,
             ),
@@ -48,39 +50,50 @@ class _AmbulatoryState extends State<Ambulatory> {
                 width: 200,
                 height: 50,
                 child: Container(
-                    child:RaisedButton(child: new Text('Ja',
-                        style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                            color: Colors.blue[900])),
+                    child: RaisedButton(
+                        child: new Text('Ja',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.blue[900])),
                         color: Colors.blue,
-                        onPressed: () {
-                        }))),
+                        onPressed: () {}))),
             SizedBox(
-              height:10,
+              height: 10,
             ),
             SizedBox(
                 width: 200,
                 height: 50,
                 child: Container(
-                    child:RaisedButton(child: new Text('Nein',
-                        style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                            color: Colors.blue[900])), color: Colors.blue,
+                    child: RaisedButton(
+                        child: new Text('Nein',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.blue[900])),
+                        color: Colors.blue,
                         onPressed: () {
                           Navigator.push(
                             context,
                             MaterialPageRoute(
-                                builder: (context) => SpontaneousBreathingPresent()),
+                                builder: (context) =>
+                                    SpontaneousBreathingPresent()),
                           );
                         }))),
             SizedBox(
-              height:100,
+              height: 100,
             ),
             SizedBox(
                 width: 200,
                 height: 50,
                 child: Container(
-                    child:RaisedButton(child: new Text('Zurück',
-                        style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                            color: Colors.white)), color: Colors.blue[900],
+                    child: RaisedButton(
+                        child: new Text('Zurück',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.white)),
+                        color: Colors.blue[900],
                         onPressed: () {
                           Navigator.pop(context);
                         }))),
@@ -90,6 +103,3 @@ class _AmbulatoryState extends State<Ambulatory> {
     );
   }
 }
-
-
-
diff --git a/rescueapp/lib/SpontaneousBreathingPresent.dart b/rescueapp/lib/SpontaneousBreathingPresent.dart
index f9e10e1412ecd82b30ab59d9db4d6f1ecf37f5cf..a0e207542ed08418ebba7bf2ab23b92c2d87de32 100644
--- a/rescueapp/lib/SpontaneousBreathingPresent.dart
+++ b/rescueapp/lib/SpontaneousBreathingPresent.dart
@@ -1,127 +1,142 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:rescueapp/AfterOpeningAirways.dart';
 
-
 class SpontaneousBreathingPresent extends StatefulWidget {
   SpontaneousBreathingPresent({Key key, this.title}) : super(key: key);
   final String title;
   @override
-  _SpontaneousBreathingPresentState createState() => _SpontaneousBreathingPresentState();
+  _SpontaneousBreathingPresentState createState() =>
+      _SpontaneousBreathingPresentState();
 }
-class _SpontaneousBreathingPresentState extends State<SpontaneousBreathingPresent> {
 
+class _SpontaneousBreathingPresentState
+    extends State<SpontaneousBreathingPresent> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        appBar: AppBar(
-          title: Text('KatApp'),
-        ),
-        body: Padding(
-          padding: EdgeInsets.symmetric(horizontal:40,vertical: 10),
-          child: Column(
-
-            children: <Widget>[
-          SizedBox(
-            height: 40,
-            child: Container(
-              decoration: BoxDecoration(
-                  color: Colors.grey[500]
-              ),
-              alignment: Alignment.center,
-              child:Text('Ist der Patient gehfähig?' ,  style: TextStyle(fontSize: 20, color: Colors.blue[900])),
-            )
-          ),
-
-              SizedBox(
+      appBar: AppBar(
+        title: Text('KatApp'),
+      ),
+      body: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 40, vertical: 10),
+        child: Column(
+          children: <Widget>[
+            SizedBox(
                 height: 40,
                 child: Container(
-                  decoration: BoxDecoration(
-                      color: Colors.grey[500]
-                ),
+                  decoration: BoxDecoration(color: Colors.grey[500]),
                   alignment: Alignment.center,
-                  child:Text('Nein', style: TextStyle(fontSize: 20, color: Colors.blue [900], backgroundColor: Colors.grey[500])),
+                  child: Text('Ist der Patient gehfähig?',
+                      style: TextStyle(fontSize: 20, color: Colors.blue[900])),
                 )),
-              SizedBox(
-                height: 150,),
-              SizedBox(
+            SizedBox(
+                height: 40,
+                child: Container(
+                  decoration: BoxDecoration(color: Colors.grey[500]),
+                  alignment: Alignment.center,
+                  child: Text('Nein',
+                      style: TextStyle(
+                          fontSize: 20,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.grey[500])),
+                )),
+            SizedBox(
+              height: 150,
+            ),
+            SizedBox(
                 height: 50,
-                 child: Container(
+                child: Container(
                   alignment: Alignment.center,
-                   decoration: BoxDecoration(
-                       border: Border(
-                         left: BorderSide(color: Colors.red, width: 2),
-                         right: BorderSide(color: Colors.red, width: 2),
-                         top: BorderSide(color: Colors.red, width: 2),
-
-                   ),),
-                  child:Text('Kategorie A', style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: Colors.blue[900], backgroundColor: Colors.white)),
-                 )),
-
-              SizedBox(
-                  height: 50,
-                  width: 500,
-                  child: Container(
-                    alignment: Alignment.center,
-                    decoration: BoxDecoration(
-                      border: Border(
-                        left: BorderSide(color: Colors.red, width: 2),
-                        right: BorderSide(color: Colors.red, width: 2),
-                        bottom: BorderSide(color: Colors.red, width: 2),
-
-                      ),),
-                    child:Text('Spontanatmung vorhanden?', style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: Colors.blue[900], backgroundColor: Colors.white)),
-                  )),
-          SizedBox(
-            height: 70,
-          ),
-              SizedBox(
-                  width: 200,
-                  height: 50,
-              child: Container(
-                child:RaisedButton(child: new Text('Ja',
-                    style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                    color: Colors.blue[900])),
-                    color: Colors.blue,
-                    onPressed: () {
-                    }))),
-              SizedBox(
-                height:10,
-              ),
-              SizedBox(
-                  width: 200,
-                  height: 50,
+                  decoration: BoxDecoration(
+                    border: Border(
+                      left: BorderSide(color: Colors.red, width: 2),
+                      right: BorderSide(color: Colors.red, width: 2),
+                      top: BorderSide(color: Colors.red, width: 2),
+                    ),
+                  ),
+                  child: Text('Kategorie A',
+                      style: TextStyle(
+                          fontSize: 22,
+                          fontWeight: FontWeight.w700,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.white)),
+                )),
+            SizedBox(
+                height: 50,
+                width: 500,
                 child: Container(
-                  child:RaisedButton(child: new Text('Nein',
-                          style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                          color: Colors.blue[900])), color: Colors.blue,
-                     onPressed: () {
-                       Navigator.push(
-                         context,
-                         MaterialPageRoute(
-                             builder: (context) => AfterOpeningAirways()),
-                       );
-                      }))),
-              SizedBox(
-                height:70,
-              ),
-              SizedBox(
-                  width: 200,
-                  height: 50,
+                  alignment: Alignment.center,
+                  decoration: BoxDecoration(
+                    border: Border(
+                      left: BorderSide(color: Colors.red, width: 2),
+                      right: BorderSide(color: Colors.red, width: 2),
+                      bottom: BorderSide(color: Colors.red, width: 2),
+                    ),
+                  ),
+                  child: Text('Spontanatmung vorhanden?',
+                      style: TextStyle(
+                          fontSize: 22,
+                          fontWeight: FontWeight.w700,
+                          color: Colors.blue[900],
+                          backgroundColor: Colors.white)),
+                )),
+            SizedBox(
+              height: 70,
+            ),
+            SizedBox(
+                width: 200,
+                height: 50,
                 child: Container(
-                  child:RaisedButton(child: new Text('Zurück',
-                      style: TextStyle(fontSize: 20,fontWeight: FontWeight.w600,
-                      color: Colors.white)), color: Colors.blue[900],
-                      onPressed: () {
-                  Navigator.pop(context);
-                }))),
-    ],
-  ),
-  ),
-  );
-}
+                    child: RaisedButton(
+                        child: new Text('Ja',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.blue[900])),
+                        color: Colors.blue,
+                        onPressed: () {}))),
+            SizedBox(
+              height: 10,
+            ),
+            SizedBox(
+                width: 200,
+                height: 50,
+                child: Container(
+                    child: RaisedButton(
+                        child: new Text('Nein',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.blue[900])),
+                        color: Colors.blue,
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                                builder: (context) => AfterOpeningAirways()),
+                          );
+                        }))),
+            SizedBox(
+              height: 70,
+            ),
+            SizedBox(
+                width: 200,
+                height: 50,
+                child: Container(
+                    child: RaisedButton(
+                        child: new Text('Zurück',
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.white)),
+                        color: Colors.blue[900],
+                        onPressed: () {
+                          Navigator.pop(context);
+                        }))),
+          ],
+        ),
+      ),
+    );
+  }
 }
-
-
-
diff --git a/rescueapp/lib/main.dart b/rescueapp/lib/main.dart
index 373566a654dbf6571a5b95eeafcc73014fe57144..5c5ed48389842ddd074234279336879d36b9c3a9 100644
--- a/rescueapp/lib/main.dart
+++ b/rescueapp/lib/main.dart
@@ -7,7 +7,6 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
-  // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
@@ -16,7 +15,6 @@ class MyApp extends StatelessWidget {
           primarySwatch: Colors.blue,
         ),
         home: MyHomePage()
-        //home: MyHomePage(title: 'KatApp Home Page'),
         );
   }
 }
@@ -26,7 +24,7 @@ class MyHomePage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('KatApp Hompage'),
+        title: Text('KatApp Homepage'),
       ),
       body: Center(
         child: Column(