Cleanup commented code, change search form to be more HTML5 compliant