diff --git a/scripts/titlescreen/components/servicefield.lua b/scripts/api/page/servicefield.lua
similarity index 100%
rename from scripts/titlescreen/components/servicefield.lua
rename to scripts/api/page/servicefield.lua
diff --git a/scripts/titlescreen/pages/service/servicepage.lua b/scripts/api/page/servicepage.lua
similarity index 96%
rename from scripts/titlescreen/pages/service/servicepage.lua
rename to scripts/api/page/servicepage.lua
index 8576da5..776625d 100644
--- a/scripts/titlescreen/pages/service/servicepage.lua
+++ b/scripts/api/page/servicepage.lua
@@ -2,7 +2,7 @@ require("common.class")
 local Dim = require("common.dimensions")
 local Util = require("common.util")
 local Page = require("api.page.page")
-local ServiceField = require("titlescreen.components.servicefield")
+local ServiceField = require("api.page.servicefield")
 
 ---@class ServicePage: Page
 ---@field title string|string[]
@@ -52,7 +52,7 @@ function ServicePage:refreshFields()
         if index == self.selectedIndex then
             field:focus()
         else
-            field:deactivate()
+            field:unfocus()
         end
     end
     Page.refreshFields(self)
@@ -72,9 +72,7 @@ function ServicePage:handleButtonInput(button)
     local direction = 0
 
     if button == game.BUTTON_BCK then
-        if self.viewHandler then
-            self.viewHandler:back()
-        end
+        self:onInvalidation()
         return
     elseif button == game.BUTTON_BTA then
         direction = -1
@@ -83,7 +81,7 @@ function ServicePage:handleButtonInput(button)
     end
 
     if direction ~= 0 then
-        field:deactivate()
+        field:unfocus()
 
         self.selectedIndex = Util.modIndex(self.selectedIndex + direction, #self.content)