diff --git a/scripts/rollback.sh b/scripts/rollback.sh
index 713364f..dec2c3a 100755
--- a/scripts/rollback.sh
+++ b/scripts/rollback.sh
@@ -3,30 +3,18 @@ save_klipper_state(){
   #read current klipper state
   cd $KLIPPER_DIR
   COMMIT_STATE=$(git rev-parse --short HEAD)
-  if [ "$GET_BRANCH" = "origin/master" ]; then
+  if [ "$GET_BRANCH" = "master" ]; then
     ORI_OLD=$previous_origin_state
     ORI_NEW=$COMMIT_STATE
     sed -i "/previous_origin_state=/s/$ORI_OLD/$ORI_NEW/" $INI_FILE
-  elif [ "$GET_BRANCH" = "origin" ]; then
-    ORI_OLD=$previous_origin_state
-    ORI_NEW=$COMMIT_STATE
-    sed -i "/previous_origin_state=/s/$ORI_OLD/$ORI_NEW/" $INI_FILE
-  elif [ "$GET_BRANCH" = "dmbutyugin/scurve-shaping" ]; then
+  elif [ "$GET_BRANCH" = "scurve-shaping" ]; then
     SHA_OLD=$previous_shaping_state
     SHA_NEW=$COMMIT_STATE
     sed -i "/previous_shaping_state=/s/$SHA_OLD/$SHA_NEW/" $INI_FILE
-  elif [ "$GET_BRANCH" = "dmbutyugin/scurve-smoothing" ]; then
+  elif [ "$GET_BRANCH" = "scurve-smoothing" ]; then
     SMO_OLD=$previous_smoothing_state
     SMO_NEW=$COMMIT_STATE
     sed -i "/previous_smoothing_state=/s/$SMO_OLD/$SMO_NEW/" $INI_FILE
-  elif [ "$GET_BRANCH" = "Arksine/work-web_server-20200131" ]; then
-    WWS_OLD=$previous_moonraker_state
-    WWS_NEW=$COMMIT_STATE
-    sed -i "/previous_moonraker_state=/s/$WWS_OLD/$WWS_NEW/" $INI_FILE
-  elif [ "$GET_BRANCH" = "Arksine/dev-moonraker-testing" ]; then
-    DMT_OLD=$previous_dev_moonraker_state
-    DMT_NEW=$COMMIT_STATE
-    sed -i "/previous_dev_moonraker_state=/s/$DMT_OLD/$DMT_NEW/" $INI_FILE
   fi
 }
 
@@ -35,16 +23,12 @@ load_klipper_state(){
   print_branch
   cd $KLIPPER_DIR
   CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
-  if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "origin" ]; then
+  if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then
     PREVIOUS_COMMIT=$previous_origin_state
-  elif [ "$GET_BRANCH" = "dmbutyugin/scurve-shaping" ]; then
+  elif [ "$GET_BRANCH" = "scurve-shaping" ]; then
     PREVIOUS_COMMIT=$previous_shaping_state
-  elif [ "$GET_BRANCH" = "dmbutyugin/scurve-smoothing" ]; then
+  elif [ "$GET_BRANCH" = "scurve-smoothing" ]; then
     PREVIOUS_COMMIT=$previous_smoothing_state
-  elif [ "$GET_BRANCH" = "Arksine/work-web_server-20200131" ]; then
-    PREVIOUS_COMMIT=$previous_moonraker_state
-  elif [ "$GET_BRANCH" = "Arksine/dev-moonraker-testing" ]; then
-    PREVIOUS_COMMIT=$previous_dev_moonraker_state
   fi
   CURRENT_COMMIT_DATE=$(git show -s --format=%cd --date=short $CURRENT_COMMIT)
   if [ "$PREVIOUS_COMMIT" != "0" ]; then
diff --git a/scripts/status.sh b/scripts/status.sh
index 1287c5e..a4b2ce7 100755
--- a/scripts/status.sh
+++ b/scripts/status.sh
@@ -186,11 +186,8 @@ klipperscreen_status(){
 #reading the log for the last branch that got checked out assuming that this is also the currently active branch.
 read_branch(){
   if [ -d $KLIPPER_DIR/.git ]; then
-    GET_BRANCH=$(cat ~/klipper/.git/logs/HEAD | grep "checkout" | tail -1 | sed "s/^.*to //")
-    #if the log file is empty, we can assume that klipper just got cloned and therefore is still on origin/master
-    if [[ -z "$GET_BRANCH" ]]; then
-      GET_BRANCH="origin/master"
-    fi
+    cd $KLIPPER_DIR
+    GET_BRANCH="$(git branch | grep "*" | cut -d"*" -f2 | cut -d" " -f2)"
   else
     GET_BRANCH=""
   fi
@@ -199,18 +196,8 @@ read_branch(){
 #prints the current klipper branch in the main menu
 print_branch(){
   read_branch
-  if [ "$GET_BRANCH" == "origin/master" ]; then
-    PRINT_BRANCH="$GET_BRANCH   "
-  elif [ "$GET_BRANCH" == "origin" ]; then
-    PRINT_BRANCH="origin/master   "
-  elif [ "$GET_BRANCH" == "master" ]; then
-    PRINT_BRANCH="origin/master   "
-  elif [ "$GET_BRANCH" == "dmbutyugin/scurve-shaping" ]; then
-    PRINT_BRANCH="scurve-shaping  "
-  elif [ "$GET_BRANCH" == "dmbutyugin/scurve-smoothing" ]; then
-    PRINT_BRANCH="scurve-smoothing"
-  elif [ "$GET_BRANCH" == "Arksine/dev-moonraker-testing" ]; then
-    PRINT_BRANCH="moonraker       "
+  if [ ! -z "$GET_BRANCH" ]; then
+    PRINT_BRANCH="$(printf "%-16s" "$GET_BRANCH")"
   else
     PRINT_BRANCH="${red}--------------${default}  "
   fi
@@ -231,9 +218,12 @@ read_remote_klipper_commit(){
     if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then
       git fetch origin -q
       REMOTE_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2 | cut -d"v" -f2)
-    else
-      git fetch $(echo "$GET_BRANCH" | cut -d"/" -f1) -q
-      REMOTE_COMMIT=$(git describe $GET_BRANCH --always --tags | cut -d "-" -f 1,2 | cut -d"v" -f2)
+    elif [ "$GET_BRANCH" = "scurve-shaping" ]; then
+      git fetch dmbutyugin scurve-shaping -q
+      REMOTE_COMMIT=$(git describe dmbutyugin/scurve-shaping --always --tags | cut -d "-" -f 1,2 | cut -d"v" -f2)
+    elif [ "$GET_BRANCH" = "scurve-smoothing" ]; then
+      git fetch dmbutyugin scurve-smoothing -q
+      REMOTE_COMMIT=$(git describe dmbutyugin/scurve-smoothing --always --tags | cut -d "-" -f 1,2 | cut -d"v" -f2)
     fi
   else
     REMOTE_COMMIT=$NONE
diff --git a/scripts/switch_branch.sh b/scripts/switch_branch.sh
index 05284ff..212c436 100755
--- a/scripts/switch_branch.sh
+++ b/scripts/switch_branch.sh
@@ -1,7 +1,7 @@
-switch_to_origin(){
+switch_to_master(){
   cd $KLIPPER_DIR
   status_msg "Switching...Please wait ..."; echo
-  git fetch origin -q && git checkout origin/master -q
+  git fetch origin -q && git checkout master; echo
 }
 
 switch_to_scurve_shaping(){
@@ -10,7 +10,7 @@ switch_to_scurve_shaping(){
   if ! git remote | grep dmbutyugin -q; then
     git remote add dmbutyugin $DMBUTYUGIN_REPO
   fi
-  git fetch dmbutyugin -q && git checkout $BRANCH_SCURVE_SHAPING -q
+  git fetch dmbutyugin -q && git checkout scurve-shaping; echo
 }
 
 switch_to_scurve_smoothing(){
@@ -19,5 +19,5 @@ switch_to_scurve_smoothing(){
   if ! git remote | grep dmbutyugin -q; then
     git remote add dmbutyugin $DMBUTYUGIN_REPO
   fi
-  git fetch dmbutyugin -q && git checkout $BRANCH_SCURVE_SMOOTHING -q
+  git fetch dmbutyugin -q && git checkout scurve-smoothing; echo
 }
\ No newline at end of file
diff --git a/scripts/ui/advanced_menu.sh b/scripts/ui/advanced_menu.sh
index 5259a80..a8b13f3 100755
--- a/scripts/ui/advanced_menu.sh
+++ b/scripts/ui/advanced_menu.sh
@@ -104,12 +104,13 @@ switch_ui(){
   echo -e " $(title_msg "Active Branch: ")${green}$GET_BRANCH${default}"
   echo
   top_border
-  echo -e "|  1) [--> origin/master]                               | "
   echo -e "|                                                       | "
+  echo -e "|  KevinOConnor:                                        | "
+  echo -e "|  1) [--> master]                                      | "
+  echo -e "|                                                       | "
+  echo -e "|  dmbutyugin:                                          | "
   echo -e "|  2) [--> scurve-shaping]                              | "
   echo -e "|  3) [--> scurve-smoothing]                            | "
-  echo -e "|                                                       | "
-  echo -e "|  4) [--> moonraker]                                   | "
   quit_footer
 }
 
@@ -124,7 +125,7 @@ switch_menu(){
         1)
           clear
           print_header
-          switch_to_origin
+          switch_to_master
           read_branch
           print_msg && clear_msg
           switch_ui;;
@@ -176,7 +177,7 @@ rollback_ui(){
   echo -e "|  used commit from which you have updated.             | "
   bottom_border
   top_border
-  echo -e "|  Active branch: ${green}$PRINT_BRANCH${default}                   | "
+  echo -e "|  Active branch: ${green}$PRINT_BRANCH${default}                      | "
   hr
   echo -e "|  Currently on commit:                                 | "
   echo -e "|  $CURR_UI                             | "
diff --git a/scripts/update.sh b/scripts/update.sh
index d8d1d5e..2e0b2b5 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -66,18 +66,8 @@ update_klipper(){
     read_branch
     save_klipper_state
     status_msg "Updating $GET_BRANCH"
-    #fetching origin/master -> error
-    #rewriting origin/master to origin
-    if [ "$GET_BRANCH" = "origin/master" ]; then
-      FETCH_BRANCH="origin"
-    else
-      FETCH_BRANCH=$(echo "$GET_BRANCH" | cut -d "/" -f1)
-    fi
-    status_msg "Fetching from $FETCH_BRANCH"
-    cd $KLIPPER_DIR
-    git fetch $FETCH_BRANCH -q && ok_msg "Fetch successfull!"
-    status_msg "Checking out $GET_BRANCH"
-    git checkout $GET_BRANCH -q && ok_msg "Checkout successfull!"
+    cd $KLIPPER_DIR && git pull && ok_msg "Update successfull!"
+
     #check for possible new dependencies and install them
     status_msg "Checking for possible new dependencies ..."
     PKGLIST=$(grep "PKGLIST=" ~/klipper/scripts/install-octopi.sh | cut -d'"' -f2- | cut -d'"' -f1 | cut -d"}" -f2)