Finishing touches with the settings button closes #41