diff --git a/README.md b/README.md
index 71e824daf..f9dfce308 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,4 @@ You are given an array of goods. Render them in a table with the ability to sele
 - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline).
 - Use the [React TypeScript cheat sheet](https://mate-academy.github.io/fe-program/js/extra/react-typescript).
 - Open one more terminal and run tests with `npm test` to ensure your solution is correct.
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_goods-selector/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://DDefty.github.io/react_goods-selector/) and add it to the PR description.
diff --git a/src/App.tsx b/src/App.tsx
index 168716b91..5e542624b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -15,58 +15,97 @@ export const goods = [
   'Garlic',
 ];
 
-export const App: React.FC = () => (
-  <main className="section container">
-    <h1 className="title">No goods selected</h1>
+interface State {
+  selectedGood: string;
+}
 
-    <h1 className="title is-flex is-align-items-center">
-      Jam is selected
-      {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-      <button data-cy="ClearButton" type="button" className="delete ml-3" />
-    </h1>
+export class App extends React.Component<{}, State> {
+  state = {
+    selectedGood: 'Jam',
+  };
 
-    <table className="table">
-      <tbody>
-        <tr data-cy="Good">
-          <td>
-            <button data-cy="AddButton" type="button" className="button">
-              +
-            </button>
-          </td>
+  // Select a good by reading the data-good attribute from the event target
+  handleSelectGood = (e: React.MouseEvent<HTMLButtonElement>) => {
+    const good = e.currentTarget.dataset.good || '';
 
-          <td data-cy="GoodTitle" className="is-vcentered">
-            Dumplings
-          </td>
-        </tr>
+    this.setState({ selectedGood: good });
+  };
 
-        <tr data-cy="Good" className="has-background-success-light">
-          <td>
+  // Clear the current selection
+  handleClearSelection = () => {
+    this.setState({ selectedGood: '' });
+  };
+
+  // Remove (clear) selection — kept as a separate method per request
+  handleRemoveSelection = () => {
+    this.setState({ selectedGood: '' });
+  };
+
+  render() {
+    return (
+      <main className="section container">
+        <h1 className="title is-flex is-align-items-center">
+          {this.state.selectedGood !== '' ? (
+            <>{this.state.selectedGood} is selected</>
+          ) : (
+            <>No goods selected</>
+          )}
+          {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
+          {this.state.selectedGood !== '' ? (
             <button
-              data-cy="RemoveButton"
+              data-cy="ClearButton"
               type="button"
-              className="button is-info"
-            >
-              -
-            </button>
-          </td>
-
-          <td data-cy="GoodTitle" className="is-vcentered">
-            Jam
-          </td>
-        </tr>
+              className="delete ml-3"
+              onClick={this.handleClearSelection}
+            />
+          ) : null}
+        </h1>
 
-        <tr data-cy="Good">
-          <td>
-            <button data-cy="AddButton" type="button" className="button">
-              +
-            </button>
-          </td>
+        <table className="table">
+          <tbody>
+            {goods.map(good => {
+              return (
+                <tr
+                  data-cy="Good"
+                  key={good}
+                  className={
+                    good === this.state.selectedGood
+                      ? 'has-background-success-light'
+                      : ''
+                  }
+                >
+                  <td>
+                    {this.state.selectedGood !== good ? (
+                      <button
+                        data-cy="AddButton"
+                        type="button"
+                        className="button"
+                        data-good={good}
+                        onClick={this.handleSelectGood}
+                      >
+                        +
+                      </button>
+                    ) : (
+                      <button
+                        data-cy="RemoveButton"
+                        type="button"
+                        className="button is-info"
+                        onClick={this.handleRemoveSelection}
+                      >
+                        -
+                      </button>
+                    )}
+                  </td>
 
-          <td data-cy="GoodTitle" className="is-vcentered">
-            Garlic
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </main>
-);
+                  <td data-cy="GoodTitle" className="is-vcentered">
+                    {good}
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      </main>
+    );
+  }
+}