improved: weights, layout