bug fix
improved gui