Various cleanups on the index page