improved gui

Change-Id: I7ad3e33c09ab54e42d69818923a914ba2ea00da7