edit/view reworked a bit