improve layout, plus add penalty settings