Finished the settings implementation