update style and fix index issue.