Feature/ngui bugfixes 2

#685 without #655