Merged old files with new for settings page