Fix multi row margin and add_remove on show templates