Improved gui, fixed focus