Added more control to the webapp