General improve and add settings activity