working on GUI
bug fix