Edited the views slightly