added number picker and buttons instead of text fields