WAM visualization & tabs - code refactoring