settings refactored
layout changings
Merge pull request #64 from programmerr47/settings

Settings