refactored names and added save button to settings