Prepared refactoring
Optimized selection
Optimized selection
Updated detail display and saving