General Improvements ; UI Improvements ; Cleaned Code