Work with ICV

Major fixes related to icv matrixes + ui fixes + minor refactoring