GUI changes

Important GUI changes