Improved gui and prepared for file saving