A method is presented for editing and saving a web page at a client based web-page editor. A rendered web page is received from a server computer and displayed at a web-page editor on the client computer. The client computer identifies one or more customizable web parts on the web page and also identifies one or more shared templates that are associated with the customizable web parts. Each identified shared template is copied as an overriding template. A data view of one or more web parts is edited, causing one or more of the overriding templates associated with the web part to be modified. When the edited changes are saved, the client computer sends a message to the server computer. The message includes the portions of the overriding templates that are modified as a result of the edited changes to the web page.