Layout changes; use std number picker