Changed settings page and all