Changes to views and grammer fixes