replace all fill_parent by match_parent