Updated composer.lock
fixed some ui issues
fixing some more ui bugs
Merge branch 'master' into badges