Other GUI changes
Near to a functional version