layout cleanup
use smaller slices