Minor changes to View and Edit