index layout and tags refactoring