Changed text and Fill button location, cleaned up code.