Added layoutviews and a bunch of other stuff