More cleanup to use layout view