Fixed two small issues with the layout templates for edit/view fragment, also optimized template