Fixed expand / collapse button problem