Added new templates and updated views for web client