Added (blank) Settings page and some refactoring