Merge pull request #109 from wilsonge/feature-ajax

Start cleanup of default.php
Fix bugs in helper