New Feature
IOS-29
separate setting menu and refactoring