Added layout choice to settings form
Merge pull request #4 from jbroadway/master

Added layout choice to settings form