Refactored webui