Changing fill_parent values to match_parent.

Please review & merge.