New index page, some cleanup