Add content to index page
Fix bugs