I have discussed it with keymaster... and there is indeed some re-ordering planned. We have agreed to do some practical usability together prior to making any changes, to ensure that every day workflow will be quick, efficient, and there will not be any pain in the ass moments.