Edited some of the views