started adding aardvark, fixed layout a bit