Changed how webApp layout is handled