Web App code improvement for all Features