Added badges and buttons