diff --git a/icon.png b/icon.png
index cb9f8ce..7555bbc 100644
Binary files a/icon.png and b/icon.png differ
diff --git a/main.lua b/main.lua
index 5c65441..b482d81 100644
--- a/main.lua
+++ b/main.lua
@@ -1,70 +1,56 @@
 function love.load()
-
-    require("sdl")
-    require("invis")
-
-    local Button = require "button"
     joysticks = love.joystick.getJoysticks()
     fightstick = joysticks[1]
 
-    --movement keys
-    movement = {}
-    mL = Button(8, 27, 24, "dpleft")
-    mD = Button(62, 27, 24, "dpdown")
-    mR = Button(109, 53, 24, "dpright")
-    mU = Button(127, 144, 30, "dpup")
+    require("sdl")
+    require("invis")
+    local Button = require "button"
 
-    --attack keys
-    attack = {}
-    bA = Button(159, 29, 24, "x")
-    bB = Button(208, 8, 24, "y")
-    bC = Button(262, 9, 24, "rightshoulder")
-    bD = Button(317, 16, 24, "leftshoulder")
-    bE = Button(155, 85, 24, "a")
-    bF = Button(206, 64,  24, "b")
-    bG = Button(262, 64, 24, "triggerright")
-    bH = Button(315,72, 24, "triggerleft")
+    love.window.setPosition(1440, 960-373)
+
+    --movement keys
+    movement = {
+        Button(8, 27, 24, "dpleft"),
+        Button(62, 27, 24, "dpdown"),
+        Button(109, 53, 24, "dpright"),
+        Button(127, 144, 30, "dpup"),
+    }
+
+    --attack keys 
+    attack = {
+        Button(159, 29, 24, "x"),
+        Button(208, 8, 24, "y"),
+        Button(262, 9, 24, "rightshoulder"),
+        Button(317, 16, 24, "leftshoulder"),
+        Button(155, 85, 24, "a"),
+        Button(206, 64,  24, "b"),
+        Button(262, 64, 24, "triggerright"),
+        Button(315,72, 24, "triggerleft"),
+    }
 end
 
 function love.update(dt)
     --movement keys
-    mL:update(dt)
-    mD:update(dt)
-    mR:update(dt)
-    mU:update(dt)
+    for i, v in ipairs(movement) do
+        v:update(dt)
+    end
 
     --attack keys
-    bA:update(dt)
-    bB:update(dt)
-    bC:update(dt)
-    bD:update(dt)
-    bE:update(dt)
-    bF:update(dt)
-    bG:update(dt)
-    bH:update(dt)
+    for i, v in ipairs(attack) do
+        v:update(dt)
+    end
 end
 
 function love.draw()
-
-    for i, joystick in ipairs(joysticks) do
-        love.graphics.print(joystick:getName(), 10, i * 20)
-    end
-
     love.graphics.setBackgroundColor(1, 179/255, 102/255)
 
     --movement keys
-    mL:draw()
-    mD:draw()
-    mR:draw()
-    mU:draw()
+    for i, v in ipairs(movement) do
+        v:draw()
+    end
 
     --attack keys
-    bA:draw()
-    bB:draw()
-    bC:draw()
-    bD:draw()
-    bE:draw()
-    bF:draw()
-    bG:draw()
-    bH:draw()
+    for i, v in ipairs(attack) do
+        v:draw()
+    end
 end
\ No newline at end of file