Fixed sidebar accordion issue and populated devices