Added SettingsPage, some little Bugfixes