diff --git a/src/apps/homescreen/layout_homescreen.py b/src/apps/homescreen/layout_homescreen.py
index aefb49788..4f741c10f 100644
--- a/src/apps/homescreen/layout_homescreen.py
+++ b/src/apps/homescreen/layout_homescreen.py
@@ -1,10 +1,6 @@
-from trezor import ui
+from trezor import ui, dispatcher, loop, res, wire
 from trezor.ui.swipe import Swipe
 from trezor.utils import unimport_gen
-from trezor import dispatcher
-from trezor import loop
-from trezor import res
-from trezor import wire
 
 
 def swipe_to_rotate():
diff --git a/src/apps/wallet/layout_get_public_key.py b/src/apps/wallet/layout_get_public_key.py
index 47d0a0053..fcef7e513 100644
--- a/src/apps/wallet/layout_get_public_key.py
+++ b/src/apps/wallet/layout_get_public_key.py
@@ -1,11 +1,11 @@
-from trezor import wire
+from trezor import wire, ui
 from trezor.utils import unimport_gen
 from trezor.workflows.request_pin import request_pin
 
 
 @unimport_gen
 def layout_get_public_key(message):
-
+    ui.clear();
     pin = yield from request_pin()
 
     if pin is not None:
diff --git a/src/trezor/ui/button.py b/src/trezor/ui/button.py
index 74c220ee1..961472367 100644
--- a/src/trezor/ui/button.py
+++ b/src/trezor/ui/button.py
@@ -1,6 +1,5 @@
 from . import display, in_area, rotate_coords
-from trezor import ui
-from trezor import loop
+from trezor import ui, loop
 
 
 DEFAULT_BUTTON = {
diff --git a/src/trezor/ui/pin.py b/src/trezor/ui/pin.py
index 29a4f385d..31c773aa1 100644
--- a/src/trezor/ui/pin.py
+++ b/src/trezor/ui/pin.py
@@ -1,6 +1,5 @@
 from . import display
-from trezor import ui
-from trezor import loop
+from trezor import ui, loop
 from trezor.crypto import random
 from .button import Button, BTN_CLICKED
 from .button import CONFIRM_BUTTON, CONFIRM_BUTTON_ACTIVE
@@ -29,7 +28,7 @@ class PinMatrix():
                         for i, d in enumerate(generate_digits())]
 
     def render(self):
-
+        
         # input line with placeholder (x, y, text, style, fg-c, bg-c)
         display.text_center(120, 20, 'Enter PIN', ui.BOLD, ui.GREY, ui.BLACK)