User settings

The above HTML was merged when I made sure my code was up-to-date with master. I only changed the the indentation of the HTML