Added settingspage and cleanup