diff --git a/locale/ExpGaming-Core/GUI/ExpGaming - Center Gui.lua b/locale/ExpGaming-Core/GUI/ExpGaming - Center Gui.lua
index ad8138d3..ea581ab3 100644
--- a/locale/ExpGaming-Core/GUI/ExpGaming - Center Gui.lua	
+++ b/locale/ExpGaming-Core/GUI/ExpGaming - Center Gui.lua	
@@ -28,7 +28,7 @@ function add_frame.tab(name,default_display,default_tooltip,frame,event)
 	ExpGui.add_input.button(name,default_display,default_tooltip,draw_frame.tab)
 end
 --Draw the center GUI for the player; do not call manually, must use other functions to call
-ExpGui.add_input.button('close_center','Close','Close this GUI',function(player,element) element.parent.parent.parent.destroy() end)
+ExpGui.add_input.button('close_center',{'expgui.close-button'},{'expgui.close-button-tooltip'},function(player,element) element.parent.parent.parent.destroy() end)
 function draw_frame.center(player,element)
 	frame_data = frames.center[element.name]
 	debug_write({'GUI','CENTER'},player.name..' '..frame_data.name)
diff --git a/locale/ExpGaming-Core/GUI/ExpGaming - Popup.lua b/locale/ExpGaming-Core/GUI/ExpGaming - Popup.lua
index f1ae07f8..2cdb1566 100644
--- a/locale/ExpGaming-Core/GUI/ExpGaming - Popup.lua	
+++ b/locale/ExpGaming-Core/GUI/ExpGaming - Popup.lua	
@@ -5,24 +5,13 @@ This file can be used with permission but this and the credit below must remain
 Contact a member of management on our discord to seek permission to use our code.
 Any changes that you may make to the code are yours but that does not make the script yours.
 Discord: https://discord.gg/XSsBV6b
-
-The credit below may be used by another script do not remove.
 ]]
-local credits = {{
-	name='ExpGaming - Popup Gui',
-	owner='Explosive Gaming',
-	dev='Cooldude2606',
-	description='Small popups in the top left',
-	factorio_version='0.15.23',
-	show=false
-	}}
-local function credit_loop(reg) for _,cred in pairs(reg) do table.insert(credits,cred) end end
 --Please Only Edit Below This Line-----------------------------------------------------------
 local add_frame = ExpGui.add_frame
 local frames = ExpGui.frames
 local draw_frame = ExpGui.draw_frame
 --used to draw the next popup frame
-ExpGui.add_input.button('close_popup','X','Close this Popup',function(player,element) element.parent.destroy() end)
+ExpGui.add_input.button('close_popup','X',{'expgui.popup-close-tooltip'},function(player,element) element.parent.destroy() end)
 local function get_next_popup(popups,name)
 	if name then 
 		local flow = popups.add{type='frame',name=name..'_on_click',direction='horizontal',style=mod_gui.frame_style} 
@@ -43,7 +32,7 @@ end
 function add_frame.popup(style,default_display,default_tooltip,on_click,event)
 	if not style then error('Popup style requires a name') end
 	if not event or type(event) ~= 'function' then error('Popup style requires a draw function') end
-	table.insert(frames.popup,{style=style,display=default_display,on_click=on_click,event=event})
+	frames.popup[style] = {style=style,display=default_display,on_click=on_click,event=event})
 	if on_click and type(on_click) == 'function' then
 		ExpGui.toolbar.add_button(style,default_display,default_tooltip,draw_frame.popup_button)
 	end
@@ -51,8 +40,7 @@ end
 --draw the popup on_click GUI for the player; do not call manually must use other functions to call
 function draw_frame.popup_button(player,element)
 	debug_write({'GUI','POPUP-BUTTON'},player.name)
-	local frame_data = nil
-	for _,frame in pairs(frames.popup) do if element.name == frame.style then frame_data = frame break end end
+	local frame_data = frames.popup[element.name]
 	local popups = mod_gui.get_frame_flow(player).popups
 	if popups[frame_data.style..'_on_click'] then popups[frame_data.style..'_on_click'].destroy() return end
 	local frame = get_next_popup(popups,frame_data.style)
@@ -61,8 +49,7 @@ end
 --used to draw a popup style can be called at any time; can not be called from a button directly
 function draw_frame.popup(style,args)
 	local args = args or {}
-	local frame_data = nil
-	for _,frame in pairs(frames.popup) do if style == frame.style then frame_data = frame break end end
+	local frame_data = frames.popup[style]
 	debug_write({'GUI','POPUP','STYLE'},style)
 	debug_write({'GUI','POPUP','ARGS'},args)
 	game.write_file('popups.log','\n'..game.tick..' Popup Style: '..style..' Was made with args of: '..table.tostring(args), true, 0)
@@ -74,6 +61,4 @@ function draw_frame.popup(style,args)
 	end
 end
 --used to make the popup area
-Event.register(defines.events.on_player_joined_game,function(event) if not mod_gui.get_frame_flow(game.players[event.player_index]).popups then mod_gui.get_frame_flow(game.players[event.player_index]).add{name='popups',type='flow',direction='vertical'} end end)
---Please Only Edit Above This Line-----------------------------------------------------------
-return credits
\ No newline at end of file
+Event.register(defines.events.on_player_joined_game,function(event) if not mod_gui.get_frame_flow(game.players[event.player_index]).popups then mod_gui.get_frame_flow(game.players[event.player_index]).add{name='popups',type='flow',direction='vertical'} end end)
\ No newline at end of file
diff --git a/locale/en/exp_core.cfg b/locale/en/exp_core.cfg
index 0e27f6f2..c08486d7 100644
--- a/locale/en/exp_core.cfg
+++ b/locale/en/exp_core.cfg
@@ -20,4 +20,7 @@ sudo-info=At game tick: __1__ Queue Lenth: __2__ Number of temp vars: __3__
 [expgui]
 button-no-display=No name
 button-no-tooltip=Ask some one what this does
-text-no-display=BLANK
\ No newline at end of file
+text-no-display=BLANK
+close-button=Close
+close-button-tooltip=Close this GUI
+popup-close-tooltip=Close this Popup
\ No newline at end of file