dunno about layout, but the choices should work now, can you please try and lemme know?