GUI fix and correct modal window for popup