Adds sortable just on parent container and fixes small issue with icon toggle