Refactored web views