Finished working on settings