backend added and templates updated