refactored theory view