Added buttons, simplified array building for input