Layout view finished

Uses autolayout.  Needs tweeking as I still don't understand autolayout, but seems to be working for now.