More cosmetic changes, gray borders etc