Added control buttons to layout
Cleaned up comments, added javadoc
Merge pull request #90 from elihart/funnel

Fixed the comments and javadoc, added buttons