diff --git a/src/App.vue b/src/App.vue
index e7c3b6a..3c14508 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@
                 matrix: [
                     "AA", "BB", "CC",
                     "DD", "AA", "BB",
-                    "CC", "DD", "AA",
+                    "CC", "DD", "DD",
                 ],
                 sequences: [
                     ["AA", "CC", "DD"],
diff --git a/src/components/Matrix.vue b/src/components/Matrix.vue
index 823243c..f201c89 100644
--- a/src/components/Matrix.vue
+++ b/src/components/Matrix.vue
@@ -2,34 +2,84 @@
     <div class="matrix">
         <h2>Code-Matrix</h2>
         <div class="matrix-row" v-for="i in size" :key="i">
-            <div class="matrix-column" v-for="j in size" :key="j" v-on:click="select(i, j)">
-                {{matrix[(j - 1)*size + (i - 1)]}}
+            <div :class="{'matrix-column': true, active: active.row === j || active.column === i, used: game.getCell(j-1, i-1).isUsed, error: error.row === j && error.column === i}"
+                 v-for="j in size" :key="j"
+                 v-on:click="select(j, i)">
+                {{game.getCell(j-1, i-1).value}}
             </div>
         </div>
     </div>
 </template>
 
 <script lang="ts">
-    import { Game } from "@/game/Game";
-    import {defineComponent, inject, computed, Ref} from "vue";
+    import { Game, matchState, matchSelectionState } from "@/game/Game";
+    import {defineComponent, inject, computed, Ref, ref} from "vue";
     
     export default defineComponent({
         setup() {
             const game = inject("game") as Ref<Game>;
             const size = computed(() => game.value.size);
             const matrix = computed(() => game.value.matrix);
+            const state = computed(() => game.value.state);
+            const active = ref({row: -1, column: -1});
+            const error = ref({row: -1, column: -1});
+            let errorTimeout: number;
 
             function select(row: number, column: number) {
                 try {
-                    game.value.pick(row-1, column-1);
+                    const newState = game.value.pick(row-1, column-1);
+                    
+                    matchState({
+                        Won: () => {
+                            console.log("Won!");
+                        },
+                        Lost: () => {
+                            console.log("Lost!");
+                        },
+                        InProgress: state => {
+                            matchSelectionState({
+                                Free: () => {/**/},
+                                Row: () => {
+                                    active.value = {
+                                        row: -1,
+                                        column,
+                                    };
+                                },
+                                Column: () => {
+                                    active.value = {
+                                        row,
+                                        column: -1,
+                                    };
+                                },
+                            })(state);
+                        },
+                    })(newState);
                 } catch (e) {
-                    console.log("nö!");
+                    error.value = {
+                        row,
+                        column,
+                    };
+
+                    if(errorTimeout) {
+                        clearTimeout(errorTimeout);
+                    }
+
+                    errorTimeout = setTimeout(() => {
+                        error.value = {
+                            row: -1,
+                            column: -1,
+                        };
+                    }, 500) as unknown as number;
                 }
             }
 
             return {
+                game,
                 size,
                 matrix,
+                state,
+                active,
+                error,
                 select
             }
         }
diff --git a/src/components/Timer.vue b/src/components/Timer.vue
index eea8155..7d628f0 100644
--- a/src/components/Timer.vue
+++ b/src/components/Timer.vue
@@ -14,8 +14,20 @@
             const game = inject("game") as Ref<Game>;
             const remainingMilliseconds = ref(game.value.remainingMilliseconds);
             const timeoutMilliseconds = computed(() => game.value.timeoutMilliseconds);
-            const progress = computed(() => remainingMilliseconds.value/timeoutMilliseconds.value*100);
-            const countdown = computed(() => (remainingMilliseconds.value/1000).toFixed(2));
+            const progress = computed(() => {
+                if(remainingMilliseconds.value > 0) {
+                    return remainingMilliseconds.value/timeoutMilliseconds.value*100;
+                }
+
+                return 0;
+            });
+            const countdown = computed(() => {
+                if(remainingMilliseconds.value > 0) {
+                    return (remainingMilliseconds.value/1000).toFixed(2);
+                }
+
+                return "0.00";
+            });
 
             const updateTime = () => {
                 remainingMilliseconds.value = game.value.remainingMilliseconds;
diff --git a/src/game/Game.ts b/src/game/Game.ts
index 7819b6d..69a2306 100644
--- a/src/game/Game.ts
+++ b/src/game/Game.ts
@@ -35,7 +35,7 @@ interface StateSpecificHandler<T> {
     InProgress(selectionState: SelectionState): T
 }
 
-function matchState<T>(h: StateSpecificHandler<T>): (a: State) => T {
+export function matchState<T>(h: StateSpecificHandler<T>): (a: State) => T {
     return (a: State) => {
         switch (a) {
             case EndState.Won:
@@ -54,7 +54,7 @@ interface SelectionStateSpecificHandler<T> {
     Column(column: number): T;
 }
 
-function matchSelectionState<T>(h: SelectionStateSpecificHandler<T>): (a: SelectionState) => T {
+export function matchSelectionState<T>(h: SelectionStateSpecificHandler<T>): (a: SelectionState) => T {
     return (a: SelectionState) => {
         switch (a.selectionMode) {
             case SelectionMode.FreePick:
@@ -162,7 +162,7 @@ export class Game {
         }
     }
 
-    pick(row: number, column: number): void {
+    pick(row: number, column: number): State {
         if (row < 0 || column < 0 || row >= this.size || column >= this.size) {
             throw new IllegalMoveError()
         }
@@ -215,6 +215,7 @@ export class Game {
         })(this.state)
 
         this.checkEndGame();
+        return this.state;
     }
 
     get maxBufferLength(): number {
diff --git a/src/sass/main.scss b/src/sass/main.scss
index c654cd2..df85d40 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -2,6 +2,8 @@
 
 $background: #121018;
 $yellow: #d0ee58;
+$red: rgb(211, 0, 0);
+$dark-gray: rgb(49, 49, 49);
 
 * {
     box-sizing: border-box;
@@ -103,16 +105,35 @@ main {
         display: flex;
         justify-content: center;
         align-items: center;
-        width: 32px;
-        height: 32px;
+        width: 64px;
+        height: 64px;
         margin: 0 5px 5px 0;
         cursor: pointer;
+        font-size: 32px;
 
         &:hover {
-            background: $yellow;
+            background: $yellow !important;
             color: $background;
         }
     }
+
+    .used {
+        opacity: 0.5;
+
+        &:hover {
+            background: none;
+            color: #fff;
+        }
+    }
+
+    .active {
+        background: $dark-gray;
+    }
+
+    .error {
+        background: $red !important;
+        color: #fff;
+    }
 }
 
 h1, h2 {