Added more options in Settings