#15: Move the Save template button to the top