Code clean
Allow calculation step sort by drag and drop (work in progress)