Show and Edit views adjusted