Add Tests: Continue

Have things ordered on modal, now want to make look nice