Reorder List
Fix "out-of-frame" controls