[BUGFIX] UI 

several bugfixes