Waypoint.php layout and tabindices fixed.
Merge branch 'master' of https://github.com/jack10/shiny-octopus