diff --git a/app/scripts/App.jsx b/app/scripts/App.jsx
index 2ea2cb7..43a0114 100644
--- a/app/scripts/App.jsx
+++ b/app/scripts/App.jsx
@@ -32,7 +32,6 @@ var App = React.createClass({
                 <div className="container">
                     <Header logos={state.logos}/>
                     <main>
-
                         <ul className="logos">
                             {logos}
                         </ul>
@@ -42,7 +41,6 @@ var App = React.createClass({
             </div>
         );
     }
-
 });
 
 module.exports = App;
diff --git a/app/scripts/components/Logo.jsx b/app/scripts/components/Logo.jsx
index 9eaecfa..8d8cc1b 100644
--- a/app/scripts/components/Logo.jsx
+++ b/app/scripts/components/Logo.jsx
@@ -7,13 +7,19 @@ var Logo = React.createClass({
         info: React.PropTypes.object.isRequired
     },
 
-    render: function () {
+    toggleInfo (e) {
+        var el = e.currentTarget;
+        el.parentNode.classList.toggle('visible');
+    },
+
+    render () {
         var info = this.props.info;
 
         return (
             <li>
                 <a href={info.url} target="_blank" className="logo-item">
-                    <img src={'../logos/' + info.image} alt={info.name} className={info.shotname}/>
+                    <img src={'../logos/' + info.image} alt={info.name} className={info.shotname}
+                         onMouseEnter={this.toggleInfo} onMouseLeave={this.toggleInfo}/>
                     <span className="name">{info.name}</span>
                 </a>
             </li>
diff --git a/app/scripts/main.js b/app/scripts/main.js
index 0b0e241..74af881 100644
--- a/app/scripts/main.js
+++ b/app/scripts/main.js
@@ -1,27 +1,9 @@
 var React = require('react'),
     App  = require('./App');
 
-var showName = (e) => {
-    var el = e.toElement;
-    el.parentNode.classList.add('visible');
-};
 
-var hideName = (e) => {
-    var el = e.fromElement;
-    el.parentNode.classList.remove('visible');
-};
-
-
-var enableTips = () => {
-    var elems = document.querySelectorAll('.logo-item img');
-    for (var i = 0; i < elems.length; i++) {
-        elems[i].addEventListener("mouseenter", showName, false);
-        elems[i].addEventListener("mouseleave", hideName, false);
-    }
-};
 
 document.addEventListener('DOMContentLoaded', function () {
     React.render(<App/>, document.getElementById('react'));
-    enableTips();
 });