Some ordering
Fix for edit buttons and other things.