refactor, remove most of indexes
take in account updates of layout of screens