Update to latest vendor + extend functionality
Add styling