Refactored app settings
Fixed #13