Add back button and templating