fixed issues on show/edit pages 

related to task: 1878