improve & finished setting page