Refactored Application
Updates on GUI