Template manager fixes

* Review paging and row expander
* Improve a bit the layout