Replaced fill_parent with match_parent
Cleaned up