#9722 - changed buttons and a few parts of the template