Removed Duplicate Files, Bug Fixes, Minor Ui Updates
Removed Duplicates, Bug Fixes, UI Improvements