Improved gui a little bit