3 files changed, 5 insertions, 32 deletions

diff --git a/src/esieequest/game/items/Inventory.java b/src/esieequest/game/items/Inventory.java
index 6bbda23..04f5a0b 100644
--- a/src/esieequest/game/items/Inventory.java
+++ b/src/esieequest/game/items/Inventory.java
@@ -150,9 +150,7 @@ public class Inventory implements SerialisableList {
          * @return the Item
          */
         public Item takeItem(final String itemName) {
-                final Item item = this.getItem(itemName);
-                this.removeItem(item);
-                return item;
+                return this.items.remove(itemName);
         }
 
         /**
diff --git a/src/esieequest/ui/rich/app/AppInterface.java b/src/esieequest/ui/rich/app/AppInterface.java
index 79a51cf..502dd71 100644
--- a/src/esieequest/ui/rich/app/AppInterface.java
+++ b/src/esieequest/ui/rich/app/AppInterface.java
@@ -82,8 +82,7 @@ abstract class AppInterface extends RichInterface implements ActionListener {
         }
 
         /**
-         * Placeholder image generation from
-         * http://stackoverflow.com/a/17802477/1348634
+         * Generates a placeholder image.
          * 
          * @param text
          *            the image text
diff --git a/src/esieequest/ui/rich/app/Layout.java b/src/esieequest/ui/rich/app/Layout.java
index 316c0a5..34c5596 100644
--- a/src/esieequest/ui/rich/app/Layout.java
+++ b/src/esieequest/ui/rich/app/Layout.java
@@ -22,6 +22,7 @@ import javax.swing.JTextPane;
 import javax.swing.KeyStroke;
 import javax.swing.border.EmptyBorder;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import esieequest.engine.commands.Command;
 import esieequest.game.Text;
@@ -32,73 +33,48 @@ import esieequest.game.map.Orientation;
  * 
  * @author Pacien TRAN-GIRARD
  */
+@Getter
 public class Layout {
 
+        @Getter(AccessLevel.NONE)
         private final AppInterface appInterface;
 
-        @Getter
         private JPanel mainPanel;
 
-        @Getter
         private JTextPane questTextPane;
 
-        @Getter
         private JLabel imageLabel;
 
-        @Getter
         private JPanel menuPanel;
-        @Getter
         private JPanel questPanel;
-        @Getter
         private JPanel gamePanel;
 
-        @Getter
         private JButton newButton;
-        @Getter
         private JButton soundButton;
-        @Getter
         private JPanel filePanel;
-        @Getter
         private JButton loadButton;
-        @Getter
         private JButton saveButton;
 
-        @Getter
         private JPanel imagePanel;
 
-        @Getter
         private JPanel userPanel;
-        @Getter
         private JPanel dispPanel;
 
-        @Getter
         private JPanel consolePanel;
-        @Getter
         private JPanel inventoryPanel;
 
-        @Getter
         private JPanel controlPanel;
-        @Getter
         private JPanel topControlPanel;
-        @Getter
         private JPanel bottomControlPanel;
 
-        @Getter
         private JTextPane infoTextPane;
-        @Getter
         private JTextField inputField;
 
-        @Getter
         private JButton forwardButton;
-        @Getter
         private JButton inventoryButton;
-        @Getter
         private JButton actionButton;
-        @Getter
         private JButton backButton;
-        @Getter
         private JButton leftButton;
-        @Getter
         private JButton rightButton;
 
         /**