added match_parent & wrap_content