fix form
Add badges
Add the badges and fixed some frame