frontend and backend changes to save bookmark
Minor changes