ditched the deprecated fill_parent all around. Closes #624.