Features/ngui upgrade