More additiong to view and edit bug