Improved Select Repair Menu