Move "Add" to top and add toggle show/hide