Improved GUI
Fixed bugs