Organize code
All the stuff
New additions to UI
Improved code organization