Second Commit. Fixed GUI