WebApp improvement