Refactored threads views hierarchy