Add 'Go back' button
Clean up