Improved GUI and fixed bugs