[GUIInternal][improvements]