Added save and continue editing button
Template tweaks