2 files changed, 27 insertions, 22 deletions
diff --git a/schist_desktop_gui/src/gui/components/buckets_view.rs b/schist_desktop_gui/src/gui/components/buckets_view.rs
index 90189e6..7419b7d 100644
--- a/schist_desktop_gui/src/gui/components/buckets_view.rs
+++ b/schist_desktop_gui/src/gui/components/buckets_view.rs
@@ -20,8 +20,8 @@ pub struct BucketsView {
 #[derive(Clone, Debug)]
 pub enum Message {
     NavigationMessage(navigation::Message<BucketNavigationEntry>),
-    SelectNextBucket,
-    SelectPrevBucket,
+    SelectNext,
+    SelectPrev,
     SetBuckets(Vec<Bucket>),
 }
 
@@ -85,6 +85,7 @@ impl<'a> Component<'a, Message, Action> for BucketsView {
                 ));
                 Action::None
             }
+
             Message::NavigationMessage(message) => match self.navigation.update(message) {
                 navigation::Action::SelectOption(bucket_navigation_entry) => {
                     self.update_greeting(&bucket_navigation_entry.to_string());
@@ -92,24 +93,22 @@ impl<'a> Component<'a, Message, Action> for BucketsView {
                 }
                 navigation::Action::None => Action::None,
             },
-            Message::SelectNextBucket => {
-                match self.navigation.update(navigation::Message::SelectNext) {
-                    navigation::Action::SelectOption(bucket_navigation_entry) => {
-                        self.update_greeting(&bucket_navigation_entry.to_string());
-                        Action::None
-                    }
-                    navigation::Action::None => Action::None,
+
+            Message::SelectNext => match self.navigation.update(navigation::Message::SelectNext) {
+                navigation::Action::SelectOption(bucket_navigation_entry) => {
+                    self.update_greeting(&bucket_navigation_entry.to_string());
+                    Action::None
                 }
-            }
-            Message::SelectPrevBucket => {
-                match self.navigation.update(navigation::Message::SelectPrev) {
-                    navigation::Action::SelectOption(bucket_navigation_entry) => {
-                        self.update_greeting(&bucket_navigation_entry.to_string());
-                        Action::None
-                    }
-                    navigation::Action::None => Action::None,
+                navigation::Action::None => Action::None,
+            },
+
+            Message::SelectPrev => match self.navigation.update(navigation::Message::SelectPrev) {
+                navigation::Action::SelectOption(bucket_navigation_entry) => {
+                    self.update_greeting(&bucket_navigation_entry.to_string());
+                    Action::None
                 }
-            }
+                navigation::Action::None => Action::None,
+            },
         }
     }
 }
diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs
index 00f4ec3..6347914 100644
--- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs
+++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs
@@ -76,18 +76,22 @@ impl<'a> Component<'a, Message, Action> for MainScreen {
                     .update(navigation::Message::SelectOption(view));
                 Action::None
             }
+
             Message::BalancesViewMessage(message) => match self.balances_view.update(message) {
                 balances_view::Action::None => Action::None,
             },
+
             Message::BucketsViewMessage(message) => {
                 self.buckets_view.update(message);
                 Action::None
             }
+
             Message::TransactionsViewMessage(message) => {
                 match self.transactions_view.update(message) {
                     transactions_view::Action::None => Action::None,
                 }
             }
+
             Message::ViewNavigationMessage(message) => match self.view_navigation.update(message) {
                 navigation::Action::SelectOption(view) => {
                     self.active_view = view;
@@ -95,6 +99,7 @@ impl<'a> Component<'a, Message, Action> for MainScreen {
                 }
                 navigation::Action::None => Action::None,
             },
+
             Message::SetBuckets(buckets) => {
                 self.buckets = buckets.clone();
                 self.balances_view
@@ -103,11 +108,13 @@ impl<'a> Component<'a, Message, Action> for MainScreen {
                     .update(buckets_view::Message::SetBuckets(buckets));
                 Action::None
             }
+
             Message::SetAccounts(accounts) => {
                 self.transactions_view
                     .update(transactions_view::Message::SetAccounts(accounts));
                 Action::None
             }
+
             Message::NextItem => match self.active_view {
                 View::Balances => {
                     self.balances_view
@@ -115,8 +122,7 @@ impl<'a> Component<'a, Message, Action> for MainScreen {
                     Action::None
                 }
                 View::Buckets => {
-                    self.buckets_view
-                        .update(buckets_view::Message::SelectNextBucket);
+                    self.buckets_view.update(buckets_view::Message::SelectNext);
                     Action::None
                 }
                 View::Transactions => {
@@ -125,6 +131,7 @@ impl<'a> Component<'a, Message, Action> for MainScreen {
                     Action::None
                 }
             },
+
             Message::PrevItem => match self.active_view {
                 View::Balances => {
                     self.balances_view
@@ -132,8 +139,7 @@ impl<'a> Component<'a, Message, Action> for MainScreen {
                     Action::None
                 }
                 View::Buckets => {
-                    self.buckets_view
-                        .update(buckets_view::Message::SelectPrevBucket);
+                    self.buckets_view.update(buckets_view::Message::SelectPrev);
                     Action::None
                 }
                 View::Transactions => {