Deleted settings activity and moved logout