updated adpater
updated settings