stucture and use only the state_block code
 - factorize some code between interface revisions
 - fix some smalls bugs