Add chip areas. Fix z-index issues.