Few fixes (weights, one Next button, layout)