Add fix for percentage based widths.
Fix conflicts.
Add minified version.