Added badge. Make focus states consistent.