Refactored
Updated gui
Removed