Update #371 - Remove hack in service provider
Fix #431 - Remove styling