Added plane cycling and improved number selection