Integrated new UI and Tweaked some core functionality
Cleaned up directories and code