diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index dc582d75..ec4ac4fb 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -145,11 +145,22 @@
                                                         <p class="help-block">Set your preferred time format. <a href="#dateTimeOptionsModal" data-toggle="modal">Click here</a> to see the parameter list.</p>
                                                     </div>
                                                 </fieldset>
+                                                <fieldset>
+                                                    <div class="wellheader">
+                                                        <h3>Plex Logs</h3>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="pms_logs_folder">Logs Folder</label>
+                                                        <input type="text" id="pms_logs_folder" name="pms_logs_folder" value="${config['pms_logs_folder']}" size="30" data-parsley-trigger="change">
+                                                        <p class="help-block">Set the folder where your Plex Server logs are. <br/><a href="https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files" target="_blank">Click here</a> for help.</p>
+                                                    </div>
+                                                </fieldset>
+                                                <br/>
                                             </div>
                                             <div class="span4">
                                                 <fieldset>
                                                     <div class="wellheader">
-                                                        <h3>PMS Settings</h3>
+                                                        <h3>Plex Media Server</h3>
                                                     </div>
                                                     <div class="form-group">
                                                         <label for="pms_ip">PMS IP</label>
@@ -171,7 +182,7 @@
                                             </div>
                                             <div class="span4">
                                                 <div class="wellheader">
-                                                    <h3>PlexWatch Settings</h3>
+                                                    <h3>PlexWatch</h3>
                                                 </div>
                                                 <fieldset>
                                                     <div class="form-group">
diff --git a/data/interfaces/default/css/plexwatch-tables.css b/data/interfaces/default/css/plexwatch-tables.css
index 07b85a0b..d4f943ee 100644
--- a/data/interfaces/default/css/plexwatch-tables.css
+++ b/data/interfaces/default/css/plexwatch-tables.css
@@ -34,7 +34,6 @@
 	position: relative;
 	clear: both;
 	zoom: 1; /* Feeling sorry for IE */
-	margin-left: -20px;
 
 }
 
diff --git a/data/interfaces/default/css/plexwatch.css b/data/interfaces/default/css/plexwatch.css
index 088379b3..5ba47852 100644
--- a/data/interfaces/default/css/plexwatch.css
+++ b/data/interfaces/default/css/plexwatch.css
@@ -8182,7 +8182,7 @@ ol.test >li {
 }
 
 .table-card-back {
-    padding: 20px 20px 20px 40px;
+    padding: 20px;
     background-color: #282828;
     margin-left: auto;
     margin-right: auto;
diff --git a/data/interfaces/default/js/tables/logs.js b/data/interfaces/default/js/tables/logs.js
index 7104492c..626fabf4 100644
--- a/data/interfaces/default/js/tables/logs.js
+++ b/data/interfaces/default/js/tables/logs.js
@@ -1,16 +1,14 @@
-$('#log_table').dataTable( {
+var log_table_options = {
+    "destroy": true,
     "responsive": {
         details: false
     },
-    "processing": false,
     "serverSide": true,
-    "ajax": {
-        "url": "getLog"
-    },
+    "processing": false,
     "sPaginationType": "bootstrap",
     "order": [ 0, 'desc'],
     "pageLength": 10,
-    "stateSave": true,
+    "stateSave": false,
     "language": {
                 "search":"Search: ",
                 "lengthMenu":"Show _MENU_ lines per page",
@@ -41,4 +39,4 @@ $('#log_table').dataTable( {
         $('#ajaxMsg').html("<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>");
         $('#ajaxMsg').addClass('success').fadeIn();
     }
-});
+}
diff --git a/data/interfaces/default/js/tables/plex_logs.js b/data/interfaces/default/js/tables/plex_logs.js
new file mode 100644
index 00000000..46e7792f
--- /dev/null
+++ b/data/interfaces/default/js/tables/plex_logs.js
@@ -0,0 +1,33 @@
+var plex_log_table_options = {
+    "destroy": true,
+    "responsive": {
+        details: false
+    },
+    "processing": false,
+    "serverSide": false,
+    "sPaginationType": "bootstrap",
+    "order": [ 0, 'desc'],
+    "pageLength": 10,
+    "stateSave": false,
+    "language": {
+                "search":"Search: ",
+                "lengthMenu":"Show _MENU_ lines per page",
+                "emptyTable": "No log information available. Have you set your logs folder in the <a href='config'>settings</a>?",
+                "info":"Showing _START_ to _END_ of _TOTAL_ lines",
+                "infoEmpty":"Showing 0 to 0 of 0 lines",
+                "infoFiltered":"(filtered from _MAX_ total lines)"},
+    "columnDefs": [
+        {
+            "targets": [0],
+            "width": "15%"
+        },
+        {
+            "targets": [1],
+            "width": "10%"
+        },
+        {
+            "targets": [2],
+            "width": "75%"
+        }
+    ]
+}
diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html
index fca7b4d0..5f4de9a6 100644
--- a/data/interfaces/default/logs.html
+++ b/data/interfaces/default/logs.html
@@ -31,21 +31,46 @@ from plexpy import helpers
         </div>
     </div>
 </div>
+
 <div class='container-fluid'>
     <div class='row-fluid'>
         <div class='span12'>
             <div class='table-card-back'>
-                <table class="display" id="log_table" width="100%">
-                    <thead>
-                    <tr>
-                        <th align='left' id="timestamp">Timestamp</th>
-                        <th align='left' id="level">Level</th>
-                        <th align='left' id="message">Message</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                </table>
+                <div role="tabpanel">
+                    <ul class="nav nav-pills" role="tablist">
+                        <li role="presentation" class="active"><a id="plexpy-logs-btn" href="#tabs-1" aria-controls="tabs-1" role="tab" data-toggle="tab">PlexPy Logs</a></li>
+                        <li role="presentation"><a id="plex-logs-btn" href="#tabs-2" aria-controls="tabs-2" role="tab" data-toggle="tab">Plex Media Server Logs</a></li>
+                    </ul>
+
+                    <div class="tab-content">
+                        <div role="tabpanel" class="tab-pane active" id="tabs-1">
+                            <table class="display" id="log_table" width="100%">
+                                <thead>
+                                <tr>
+                                    <th align='left' id="timestamp">Timestamp</th>
+                                    <th align='left' id="level">Level</th>
+                                    <th align='left' id="message">Message</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div role="tabpanel" class="tab-pane" id="tabs-2">
+                            <table class="display" id="plex_log_table" width="100%">
+                                <thead>
+                                <tr>
+                                    <th align='left' id="plex_timestamp">Timestamp</th>
+                                    <th align='left' id="plex_level">Level</th>
+                                    <th align='left' id="plex_message">Message</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -71,7 +96,36 @@ from plexpy import helpers
 <script src="interfaces/default/js/dataTables.responsive.js"></script>
 <script src="interfaces/default/js/jquery.dataTables.bootstrap.pagination.integration.js"></script>
 <script src="interfaces/default/js/tables/logs.js"></script>
+<script src="interfaces/default/js/tables/plex_logs.js"></script>
 <script>
+
+        $(document).ready(function() {
+            LoadPlexPyLogs();
+        });
+
+        function LoadPlexPyLogs() {
+            log_table_options.ajax = {
+                "url": "getLog"
+            }
+            log_table = $('#log_table').DataTable(log_table_options);
+        }
+
+        function LoadPlexLogs() {
+            plex_log_table_options.ajax = {
+                "url": "get_plex_log"
+            }
+            plex_log_table = $('#plex_log_table').DataTable(plex_log_table_options);
+        }
+
+        $("#plexpy-logs-btn").click(function() {
+            LoadPlexPyLogs();
+        });
+
+        $("#plex-logs-btn").click(function() {
+            console.log('clicked da button');
+            LoadPlexLogs();
+        });
+
         var timer;
         function setRefresh()
         {
@@ -84,7 +138,13 @@ from plexpy import helpers
                 }
                 if(refreshrate.value != 0)
                 {
-                    timer = setInterval("$('#log_table').dataTable().fnDraw()",1000*refreshrate.value);
+                    timer = setInterval(function() {
+                        if ($("#tabs-1").hasClass("active")) {
+                            log_table.ajax.reload();
+                        } else {
+                            plex_log_table.ajax.reload();
+                        }
+                    }, 1000*refreshrate.value);
                 }
             }
         }
diff --git a/plexpy/config.py b/plexpy/config.py
index ce8430d8..43077177 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -23,6 +23,7 @@ _CONFIG_DEFINITIONS = {
     'GROUPING_CHARTS': (int, 'PlexWatch', 0),
     'PLEXWATCH_DATABASE': (str, 'PlexWatch', ''),
     'PMS_IP': (str, 'PMS', '127.0.0.1'),
+    'PMS_LOGS_FOLDER': (str, 'PMS', ''),
     'PMS_PORT': (int, 'PMS', 32400),
     'PMS_PASSWORD': (str, 'PMS', ''),
     'PMS_TOKEN': (str, 'PMS', ''),
diff --git a/plexpy/log_reader.py b/plexpy/log_reader.py
new file mode 100644
index 00000000..e97a13e6
--- /dev/null
+++ b/plexpy/log_reader.py
@@ -0,0 +1,74 @@
+#  This file is part of PlexPy.
+#
+#  PlexPy is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  PlexPy is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+from plexpy import helpers, logger
+import re
+import os
+import plexpy
+
+def get_log_tail(window=20):
+
+    if plexpy.CONFIG.PMS_LOGS_FOLDER:
+        log_file = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, 'Plex Media Server.log')
+    else:
+        return []
+
+    try:
+        logfile = open(log_file, "r")
+    except IOError, e:
+        logger.error('Unable to open Plex Log file. %s' % e)
+        return []
+
+    log_lines = tail(logfile, window)
+    clean_lines = []
+    for i in log_lines:
+        log_time = i.split(' [')[0]
+        log_level = i.split('] ', 1)[1].split(' - ',1)[0]
+        log_msg = i.split('] ', 1)[1].split(' - ',1)[1]
+        full_line = [log_time, log_level, log_msg]
+        clean_lines.append(full_line)
+
+    return clean_lines
+
+# https://stackoverflow.com/questions/136168/get-last-n-lines-of-a-file-with-python-similar-to-tail
+def tail(f, window=20):
+    """
+    Returns the last `window` lines of file `f` as a list.
+    """
+    if window == 0:
+        return []
+    BUFSIZ = 1024
+    f.seek(0, 2)
+    bytes = f.tell()
+    size = window + 1
+    block = -1
+    data = []
+    while size > 0 and bytes > 0:
+        if bytes - BUFSIZ > 0:
+            # Seek back one whole BUFSIZ
+            f.seek(block * BUFSIZ, 2)
+            # read BUFFER
+            data.insert(0, f.read(BUFSIZ))
+        else:
+            # file too small, start from begining
+            f.seek(0,0)
+            # only read what was not read
+            data.insert(0, f.read(bytes))
+        linesFound = data[0].count('\n')
+        size -= linesFound
+        bytes -= BUFSIZ
+        block -= 1
+    return ''.join(data).splitlines()[-window:]
+
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index a6c39904..4542d65a 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -13,7 +13,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-from plexpy import logger, notifiers, plextv, pmsconnect, plexwatch, db, common
+from plexpy import logger, notifiers, plextv, pmsconnect, plexwatch, db, common, log_reader
 from plexpy.helpers import checked, radio
 
 from mako.lookup import TemplateLookup
@@ -229,6 +229,17 @@ class WebInterface(object):
             'data': rows,
         })
 
+    @cherrypy.expose
+    def get_plex_log(self, window=1000, **kwargs):
+        log_lines = []
+        try:
+            log_lines = {'data': log_reader.get_log_tail(window=window)}
+        except:
+            logger.warn("Unable to retrieve Plex Logs.")
+
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(log_lines)
+
     @cherrypy.expose
     def generateAPI(self):
         apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32]
@@ -305,6 +316,7 @@ class WebInterface(object):
             "email_smtp_port": int(plexpy.CONFIG.EMAIL_SMTP_PORT),
             "email_tls": checked(plexpy.CONFIG.EMAIL_TLS),
             "pms_ip": plexpy.CONFIG.PMS_IP,
+            "pms_logs_folder": plexpy.CONFIG.PMS_LOGS_FOLDER,
             "pms_port": plexpy.CONFIG.PMS_PORT,
             "pms_token": plexpy.CONFIG.PMS_TOKEN,
             "pms_use_bif": checked(plexpy.CONFIG.PMS_USE_BIF),