2nd iteration

improved gui