Aritsts layout improvements