Modified structure of views slightly.