Refactor structure of Buttons section. Input field added