GUI related changes

this discussion can help you: