Issue #6: Clean URLs

* Fixed index page conditions