Improvements to UI, Code Layout, and User Experience