Merged file
Settings folder
Changed settings page to modal