diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 553158b..91eccb8 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -2,11 +2,7 @@ name: API
 
 on: 
   push:
-    paths:
-      - "api/**"
-  pull_request:
-    paths:
-      - "api/**"
+    branches: [ "master" ]
 
 jobs:
   api-build:
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index 6272945..77532dd 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -2,11 +2,7 @@ name: Client
 
 on: 
   push:
-    paths:
-      - "client/**"
-  pull_request:
-    paths:
-      - "client/**"
+    branches: [ "master" ]
 
 jobs:
   client-build:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 0000000..8f587a0
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,98 @@
+name: PR
+
+on: 
+  pull_request:
+    branches: [ "*" ]
+
+jobs:
+  client-build:
+    name: Client
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./client
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: 14.x
+          
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      
+      - name: Installling dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn
+
+      - name: Lint
+        run: yarn lint
+      
+      - name: Build
+        run: yarn build
+        env:
+          VITE_SENTRY_DSN: https://examplePublicKey@o0.ingest.sentry.io/0
+          VITE_NODE_ENV: development
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: javascript
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
+
+  api-build:
+    name: API
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./api
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16.x
+
+      - name: cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      
+      - name: Installling dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: go mod vendor
+      
+      - name: Build
+        run: go build main.go
+      
+      - name: Run test & coverage
+        run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./...
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: go
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
\ No newline at end of file
diff --git a/client/src/routes/guide.svelte b/client/src/routes/guide.svelte
index 90e642e..4da16bc 100644
--- a/client/src/routes/guide.svelte
+++ b/client/src/routes/guide.svelte
@@ -24,21 +24,19 @@
 
 <section>
   <h2>{$_('guide.direct.1')} <code>&lt;img&gt;</code> {$_('guide.direct.2')}</h2>
-  <Codeblock>
-    &lt;img src="https://jokesbapak2.herokuapp.com/v1/" /&gt;
-  </Codeblock>
+  <Codeblock>&lt;img src="https://jokesbapak2.herokuapp.com/v1/" /&gt;</Codeblock>
 </section>
 
 <section>
   <h2>{$_('guide.fetch.1')}</h2>
   <p>{$_('guide.fetch.2')}</p>
   <Codeblock>
-    fetch("https://jokesbapak2.herokuapp.com/v1/")<br>
-    &nbsp;&nbsp;.then(response => response.text())<br>
-    &nbsp;&nbsp;.then(data => console.log(data))<br>
-    <br>
-    // {$_('guide.fetch.3')}<br>
-      <br>
+    fetch("https://jokesbapak2.herokuapp.com/v1/")<br />
+    &nbsp;&nbsp;.then(response => response.text())<br />
+    &nbsp;&nbsp;.then(data => console.log(data))<br />
+    <br />
+    // {$_('guide.fetch.3')}<br />
+    <br />
     &lt;img src="data:image/jpeg;base64, &lcub; data &rcub;" /&gt;
   </Codeblock>
 </section>
@@ -60,4 +58,4 @@
   section {
     @apply pt-6;
   }
-</style>
\ No newline at end of file
+</style>