massive index page changes, cool new look
merge conflict resolution