A couple quick design changes