added refresh to settings page
reorganized method definitions
Merge pull request #1602 from isocolsky/fixes

Small usability fix