Cleanup

Though this does interfere with the noBorder layout as it leaves a border-sized empty border at the right side.