close#1 Working on settings tab