Changed fill_parent to match_parent