UI Cleanup
UI Improvements
Reduce memory usage
Misc updates