removed badges, added rows

added alert message