Added location for expand / collapse stuff