Moved settings markup into its own folder and removed trailing whitespace