Better builder layout and extra support