Add board select and small variant improvement