indentation fix
Bugfix in state matrix.
Bugfix when advancing states.
Icons and classes fixed in the matrix view.