Did some more layout, playing around with frameTest again