Fix tabs -> spaces, manage available sites too

Change-Id: I95ed058d644efaf32ebe86edb0f5245c56ce618d