proper borders instead of halos + cleanup