diff --git a/applications/examples/models/menu.py b/applications/examples/models/menu.py
index d81bfa36..3f331c44 100644
--- a/applications/examples/models/menu.py
+++ b/applications/examples/models/menu.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 response.menu = [
-    (T('Home'), False, URL('default', 'index')),
-    (T('About'), False, URL('default', 'what')),
-    (T('Download'), False, URL('default', 'download')),
-    (T('Docs & Resources'), False, URL('default', 'documentation')),
-    (T('Support'), False, URL('default', 'support')),
-    (T('Contributors'), False, URL('default', 'who'))]
+    (T('Home'), request.controller == 'default' and request.function == 'index', URL('default', 'index')),
+    (T('About'), request.controller == 'default' and request.function == 'what', URL('default', 'what')),
+    (T('Download'), request.controller == 'default' and request.function == 'download', URL('default', 'download')),
+    (T('Docs & Resources'), request.controller == 'default' and request.function == 'documentation', URL('default', 'documentation')),
+    (T('Support'), request.controller == 'default' and request.function == 'support', URL('default', 'support')),
+    (T('Contributors'), request.controller == 'default' and request.function == 'who', URL('default', 'who'))]
 
 #########################################################################
 ## Changes the menu active item
diff --git a/applications/examples/static/css/examples.css b/applications/examples/static/css/examples.css
new file mode 100644
index 00000000..293b8b89
--- /dev/null
+++ b/applications/examples/static/css/examples.css
@@ -0,0 +1,28 @@
+h1,h2,h3,h4,h5,h6{color: #111; text-transform:none}
+
+th, td {color: black}
+tbody tr:hover {background-color:transparent}
+tbody tr {border-bottom: none}
+p {text-align: left}
+p, li { line-height: 1.6em}
+pre {background-color: black!important;border-radius:5px; color:white; padding:10px}
+a.btn.btn180 {padding:20px; font-size:1.2em; width:200px}   
+
+.menu .web2py-menu-active a {
+    color: #26a69a;
+}
+
+.spaced-vertical {
+    margin: 0 0.5em 0.5em 0;
+}
+
+.btn:hover,
+a.noeffect img:hover {
+    transition: scale .5s;
+    transform: scale(1.05);
+}
+
+.btn,
+a.noeffect img {
+    transition: all .2s ease-in-out;
+} 
diff --git a/applications/examples/views/default/download.html b/applications/examples/views/default/download.html
index 6ac7b0c5..eaca3a8e 100644
--- a/applications/examples/views/default/download.html
+++ b/applications/examples/views/default/download.html
@@ -17,7 +17,7 @@
     <tbody>
       <tr>
         <td>
-          <a class="btn btn180 rounded red" href="http://www.web2py.com/examples/static/web2py_win.zip">For Windows</a>
+          <a class="btn btn180 rounded green" href="http://www.web2py.com/examples/static/web2py_win.zip">For Windows</a>
         </td>
         <td>
           <a class="btn btn180 rounded yellow" href="http://www.web2py.com/examples/static/nightly/web2py_win.zip">For Windows</a>
@@ -28,7 +28,7 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded red" href="http://www.web2py.com/examples/static/web2py_osx.zip">For Mac</a>
+          <a class="btn btn180 rounded green" href="http://www.web2py.com/examples/static/web2py_osx.zip">For Mac</a>
         </td>
         <td>
           <a class="btn btn180 rounded yellow" href="http://www.web2py.com/examples/static/nightly/web2py_osx.zip">For Mac</a>
@@ -37,7 +37,7 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded red" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a>
+          <a class="btn btn180 rounded green" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a>
         </td>
         <td>
           <a class="btn btn180 rounded yellow" href="http://www.web2py.com/examples/static/nightly/web2py_src.zip">Source Code</a>
@@ -48,7 +48,7 @@
       </tr>
       <tr>
         <td>
-          <a class="btn btn180 rounded red" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a>
+          <a class="btn btn180 rounded green" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a>
         </td>
         <td>
           <a class="btn btn180 rounded" href="https://github.com/web2py/web2py/releases">Change Log</a>
diff --git a/applications/examples/views/default/index.html b/applications/examples/views/default/index.html
index 8cd013ca..19708c79 100644
--- a/applications/examples/views/default/index.html
+++ b/applications/examples/views/default/index.html
@@ -3,22 +3,22 @@
 <div class="container">
   <div class="twothirds">
     <div class="padded">
-      <h3>web2py<sup>TM</sup> Web Framework</h3>
+      <h3><img src="{{=URL('static/images', 'web2py_logo.png')}}"> Web Framework</h3>
       <p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#Security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>.</p>
       <table width="100%">
 	<tr>
 	  <td>
-	    <a href="http://web2py.com/book">
+	    <a class="noeffect" href="http://web2py.com/book">
 	      <img src="{{=URL('static','images/book-5th.png')}}" />
 	    </a>
 	  </td>
 	  <td>
-	    <a href="https://vimeo.com/album/3016728">
+	    <a class="noeffect" href="https://vimeo.com/album/3016728">
 	      <img src="{{=URL('static','images/videos.png')}}" />
 	    </a>
 	  </td>
 	  <td>
-	    <a href="http://link.packtpub.com/SUlnrN">
+	    <a class="noeffect" href="http://link.packtpub.com/SUlnrN">
 	      <img src="{{=URL('static','images/book-recipes.png')}}" />
 	    </a>
 	  </td>
@@ -29,8 +29,8 @@
   </div>
   <div class="third">
     <div class="padded center">
-      <a href="http://www.infoworld.com/slideshow/24605/infoworlds-2012-technology-of-the-year-award-winners-183313#slide23">
-        <img src="{{=URL('static','images/infoworld2012.jpeg')}}">
+      <a class="noeffect" href="http://www.infoworld.com/slideshow/24605/infoworlds-2012-technology-of-the-year-award-winners-183313#slide23">
+        <img class="spaced-vertical" src="{{=URL('static','images/infoworld2012.jpeg')}}">
       </a>
       <a class="btn rounded red fill" href="{{=URL('download')}}">
         Download Now
diff --git a/applications/examples/views/default/who.html b/applications/examples/views/default/who.html
index 14f76d69..0b939b62 100644
--- a/applications/examples/views/default/who.html
+++ b/applications/examples/views/default/who.html
@@ -82,6 +82,7 @@
 </li><li>Keith Yang (openid)
 </li><li><a href="http://dev.s-cubism.com/web2py_plugins">Kenji Hosoda</a> (plugins)
 </li><li>Kyle Smith (javascript)
+</li><li><a href="https://github.com/leonelcamara">Leonel Câmara</a>
 </li><li><a href="http://blog.donews.com/limodou/">Limodou</a> (winservice)
 </li><li><a href="https://github.com/lucasdavila">Lucas D'Ávila</a>
 </li><li>Marc Abramowitz (tests and travis continuous integration) 
diff --git a/applications/examples/views/layout.html b/applications/examples/views/layout.html
index 6026ddea..b6dbcb4c 100644
--- a/applications/examples/views/layout.html
+++ b/applications/examples/views/layout.html
@@ -4,19 +4,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
-    <link href="{{=URL('static','css/stupid.css')}}" rel="stylesheet" type="text/css"/>
     <link href="{{=URL('static','css/calendar.css')}}" rel="stylesheet" type="text/css"/>
     <link href="{{=URL('static','css/web2py.css')}}" rel="stylesheet" type="text/css"/>
+    <link href="{{=URL('static','css/stupid.css')}}" rel="stylesheet" type="text/css"/>
+    <link href="{{=URL('static','css/examples.css')}}" rel="stylesheet" type="text/css"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
-    <style>
-      th, td {color: black!important}
-      tbody tr:hover {background-color:transparent}
-      tbody tr {border-bottom: none}
-      p {text-align: left}
-      p, li { line-height: 1.6em}
-      pre {background-color: black!important;border-radius:5px; color:white; padding:10px}
-      a.btn.btn180 {padding:20px; font-size:1.2em; width:200px!important}      
-    </style>
+    <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
+    <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
     {{
     left_sidebar_enabled = globals().get('left_sidebar_enabled', False)
     right_sidebar_enabled = globals().get('right_sidebar_enabled', False)
@@ -29,7 +23,7 @@
     <header class="black padded">      
       <div class="container middle max900">
         <div class="fill middle">                    
-          <label class="ham padded fa fa-bars" for="menu"></label>
+          <label class="ham" for="menu"><i class="fa fa-bars padded"></i></label>
           <div class="burger accordion">
             <input type="checkbox" id="menu"/>
             {{=MENU(response.menu,_class='menu')}}