ticket:5 modify templates to fix image width
Merge branch 't5_edit'